fixup! debugger: add edit-free runtime expression probes to node inspect

Author: joyeecheung

lib/internal/debugger/inspect.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const {
+  ArrayFrom,
   ArrayIsArray,
   ArrayPrototypeForEach,
   ArrayPrototypeJoin,
@@ -143,37 +144,18 @@ function parseUnsignedInteger(value, name, allowZero = false) {
   return parsed;
 }
 
-// Parse from right to left to allow Windows paths with drive letters.
 // Accepts file:line or file:line:column formats.
+// Non-greedy (.+?) allows Windows drive-letter paths like C:\foo.js:10.
 function parseProbeLocation(text) {
-  const lastColon = StringPrototypeLastIndexOf(text, ':');
-  if (lastColon === -1) {
-    throw new ERR_DEBUGGER_STARTUP_ERROR(`Invalid probe location: ${text}`);
-  }
-
-  const right = StringPrototypeSlice(text, lastColon + 1);
-  if (RegExpPrototypeExec(kDigitsRegex, right) === null) {
-    throw new ERR_DEBUGGER_STARTUP_ERROR(`Invalid probe location: ${text}`);
-  }
-
-  let file = StringPrototypeSlice(text, 0, lastColon);
-  let line = parseUnsignedInteger(right, 'probe location');
-  let column;
-
-  const secondColon = StringPrototypeLastIndexOf(file, ':');
-  if (secondColon !== -1) {
-    const maybeLine = StringPrototypeSlice(file, secondColon + 1);
-    if (RegExpPrototypeExec(kDigitsRegex, maybeLine) !== null) {
-      column = line;
-      line = parseUnsignedInteger(maybeLine, 'probe location');
-      file = StringPrototypeSlice(file, 0, secondColon);
-    }
-  }
-
-  if (file.length === 0) {
+  const match = RegExpPrototypeExec(/^(.+?):(\d+)(?::(\d+))?$/, text);
+  if (match === null) {
     throw new ERR_DEBUGGER_STARTUP_ERROR(`Invalid probe location: ${text}`);
   }
 
+  const file = match[1];
+  const line = parseUnsignedInteger(match[2], 'probe location');
+  const column = match[3] !== undefined ?
+    parseUnsignedInteger(match[3], 'probe location') : undefined;
   const target = column === undefined ? [file, line] : [file, line, column];
 
   return {
@@ -184,21 +166,12 @@ function parseProbeLocation(text) {
   };
 }
 
-function formatProbeTuple(tuple) {
-  return ArrayPrototypeJoin(ArrayPrototypeMap(tuple, (part) => `${part}`), ':');
-}
-
 function formatPendingProbeLocations(probes, pending) {
   const seen = new SafeSet();
-  const names = [];
   for (const probeIndex of pending) {
-    const location = formatProbeTuple(probes[probeIndex].target);
-    if (!seen.has(location)) {
-      seen.add(location);
-      ArrayPrototypePush(names, location);
-    }
+    seen.add(ArrayPrototypeJoin(probes[probeIndex].target, ':'));
   }
-  return ArrayPrototypeJoin(names, ', ');
+  return ArrayPrototypeJoin(ArrayFrom(seen), ', ');
 }
 
 function formatTargetExitMessage(probes, pending, exitCode, signal) {
@@ -324,7 +297,7 @@ function buildProbeTextReport(report) {
   for (const result of report.results) {
     if (result.event === 'hit') {
       const probe = report.probes[result.probe];
-      const location = formatProbeTuple(probe.target);
+      const location = ArrayPrototypeJoin(probe.target, ':');
       ArrayPrototypePush(lines, `Hit ${result.hit} at ${location}`);
       if (result.error !== undefined) {
         ArrayPrototypePush(lines,
@@ -891,14 +864,6 @@ class ProbeInspectorSession {
   }
 }
 
-async function runScript(script, scriptArgs, inspectHost, inspectPort,
-                         childPrint) {
-  return launchChildProcess([script, ...scriptArgs],
-                            inspectHost,
-                            inspectPort,
-                            childPrint);
-}
-
 function createAgentProxy(domain, client) {
   const agent = new EventEmitter();
   agent.then = (then, _catch) => {
@@ -933,9 +898,8 @@ class NodeInspector {
 
     if (options.script) {
       this._runScript = FunctionPrototypeBind(
-        runScript, null,
-        options.script,
-        options.scriptArgs,
+        launchChildProcess, null,
+        [options.script, ...options.scriptArgs],
         options.host,
         options.port,
         FunctionPrototypeBind(this.childPrint, this));

test/parallel/test-debugger-probe-activation.js

@@ -1,4 +1,6 @@
-// This tests that probe mode only activates when --probe is present.
+// This tests that probe mode only activates when --probe is present,
+// so that other options can be used as user script arguments without
+// accidentally activating probe mode.
 'use strict';
 
 const common = require('../common');
@@ -24,6 +26,7 @@ const cli = startCLI([
     await cli.waitForInitialBreak();
     await cli.waitForPrompt();
     await cli.command('exec JSON.stringify(process.argv.slice(2))');
+    // Check that it's parsable as usual.
     assert.match(
       cli.output,
       /\["--json","--preview","--timeout=1","--expr","value"\]/,