From a896aa80b2e4690ada4c1d8b6201b3039cf7f56b Mon Sep 17 00:00:00 2001
From: Yagiz Nizipli <yagiz@nizipli.com>
Date: Fri, 22 Mar 2024 17:32:16 -0400
Subject: [PATCH 1/3] cli: implement `node run <script-in-package-json>`

---
 doc/api/cli.md                                | 31 ++++++++
 lib/internal/main/run.js                      | 71 +++++++++++++++++++
 src/node.cc                                   |  4 ++
 src/node_modules.cc                           | 39 ++++++++++
 src/node_modules.h                            |  3 +
 test/fixtures/run-script/.env                 |  1 +
 .../fixtures/run-script/node_modules/.bin/ada |  2 +
 .../run-script/node_modules/.bin/custom-env   |  2 +
 .../node_modules/.bin/positional-args         |  2 +
 test/fixtures/run-script/package.json         |  8 +++
 test/parallel/test-node-run.js                | 64 +++++++++++++++++
 typings/internalBinding/modules.d.ts          |  1 +
 12 files changed, 228 insertions(+)
 create mode 100644 lib/internal/main/run.js
 create mode 100644 test/fixtures/run-script/.env
 create mode 100755 test/fixtures/run-script/node_modules/.bin/ada
 create mode 100755 test/fixtures/run-script/node_modules/.bin/custom-env
 create mode 100755 test/fixtures/run-script/node_modules/.bin/positional-args
 create mode 100644 test/fixtures/run-script/package.json
 create mode 100644 test/parallel/test-node-run.js

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 0f08c81794b5b2..4a7dc98b2ce5d8 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -51,6 +51,37 @@ entry point, the `node` command will accept as input only files with `.js`,
 [`--experimental-wasm-modules`][] is enabled; and with no extension when
 [`--experimental-default-type=module`][] is passed.
 
+## Sub-commands
+
+### `node run <command> [<arguments>]`
+
+<!-- YAML
+added: REPLACEME
+-->
+
+> Stability: 1.1 - Active development
+
+This runs a specified command from a package.json's `"scripts"` object.
+If no `"command"` is provided, it will list the available scripts.
+
+`node run` prepends `./node_modules/.bin`, relative to the current
+working directory, to the `PATH` in order to execute the binaries from
+dependencies.
+
+For example, the following command will run the `test` script of
+the `package.json` in the current folder:
+
+```console
+$ node run test
+```
+
+You can also pass arguments to the command. Any argument after the script
+name will be appended to the script:
+
+```console
+$ node run test --verbose
+```
+
 ## Options
 
 <!-- YAML
diff --git a/lib/internal/main/run.js b/lib/internal/main/run.js
new file mode 100644
index 00000000000000..b722fa52248306
--- /dev/null
+++ b/lib/internal/main/run.js
@@ -0,0 +1,71 @@
+'use strict';
+/* eslint-disable node-core/prefer-primordials */
+
+// There is no need to add primordials to this file.
+// `run.js` is a script only executed when `node run <script>` is called.
+const {
+  prepareMainThreadExecution,
+  markBootstrapComplete,
+} = require('internal/process/pre_execution');
+const { getPackageJSONScripts } = internalBinding('modules');
+const { execSync } = require('child_process');
+const { resolve, delimiter } = require('path');
+
+prepareMainThreadExecution(false, false);
+
+markBootstrapComplete();
+
+// TODO(@anonrig): Search for all package.json's until root folder.
+const json_string = getPackageJSONScripts();
+
+// Check if package.json exists and is parseable
+if (json_string === undefined) {
+  process.exit(1);
+  return;
+}
+const scripts = JSON.parse(json_string);
+// Remove the first two arguments, which are the node binary and the command "run"
+const args = process.argv.slice(2);
+const id = args.shift();
+let command = scripts[id];
+
+if (!command) {
+  const { error } = require('internal/console/global');
+
+  error(`Missing script: "${id}"`);
+
+  const keys = Object.keys(scripts);
+  if (keys.length === 0) {
+    error('There are no scripts available in package.json');
+  } else {
+    error('Available scripts are:\n');
+    for (const script of keys) {
+      error(`  ${script}: ${scripts[script]}`);
+    }
+  }
+  process.exit(1);
+  return;
+}
+
+const env = process.env;
+const cwd = process.cwd();
+const binPath = resolve(cwd, 'node_modules/.bin');
+
+// Filter all environment variables that contain the word "path"
+const keys = Object.keys(env).filter((key) => /^path$/i.test(key));
+const PATH = keys.map((key) => env[key]);
+
+// Append only the current folder bin path to the PATH variable.
+// TODO(@anonrig): Prepend the bin path of all parent folders.
+const paths = [binPath, PATH].join(delimiter);
+for (const key of keys) {
+  env[key] = paths;
+}
+
+// If there are any remaining arguments left, append them to the command.
+// This is useful if you want to pass arguments to the script, such as
+// `node run linter --help` which runs `biome --check . --help`
+if (args.length > 0) {
+  command += ' ' + args.map((arg) => arg.trim()).join(' ');
+}
+execSync(command, { stdio: 'inherit', env });
diff --git a/src/node.cc b/src/node.cc
index 07a91f485502b8..d55fb3a2ece87b 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -409,6 +409,10 @@ MaybeLocal<Value> StartExecution(Environment* env, StartExecutionCallback cb) {
     return StartExecution(env, "internal/main/watch_mode");
   }
 
+  if (!first_argv.empty() && first_argv == "run") {
+    return StartExecution(env, "internal/main/run");
+  }
+
   if (!first_argv.empty() && first_argv != "-") {
     return StartExecution(env, "internal/main/run_main_module");
   }
diff --git a/src/node_modules.cc b/src/node_modules.cc
index 9dca1857f96e43..06f57bb1614e4e 100644
--- a/src/node_modules.cc
+++ b/src/node_modules.cc
@@ -219,6 +219,21 @@ const BindingData::PackageConfig* BindingData::GetPackageJSON(
       if (field_value == "commonjs" || field_value == "module") {
         package_config.type = field_value;
       }
+    } else if (key == "scripts") {
+      if (value.type().get(field_type)) {
+        return throw_invalid_package_config();
+      }
+      switch (field_type) {
+        case simdjson::ondemand::json_type::object: {
+          if (value.raw_json().get(field_value)) {
+            return throw_invalid_package_config();
+          }
+          package_config.scripts = field_value;
+          break;
+        }
+        default:
+          break;
+      }
     }
   }
   // package_config could be quite large, so we should move it instead of
@@ -344,6 +359,28 @@ void BindingData::GetNearestParentPackageJSONType(
   args.GetReturnValue().Set(Array::New(realm->isolate(), values, 3));
 }
 
+void BindingData::GetPackageJSONScripts(
+    const FunctionCallbackInfo<Value>& args) {
+  Realm* realm = Realm::GetCurrent(args);
+  std::string path = "package.json";
+
+  THROW_IF_INSUFFICIENT_PERMISSIONS(
+      realm->env(), permission::PermissionScope::kFileSystemRead, path);
+
+  auto package_json = GetPackageJSON(realm, path);
+  if (package_json == nullptr) {
+    printf("Can't read package.json\n");
+    return;
+  } else if (!package_json->scripts.has_value()) {
+    printf("Can't read package.json \"scripts\" object\n");
+    return;
+  }
+
+  args.GetReturnValue().Set(
+      ToV8Value(realm->context(), package_json->scripts.value())
+          .ToLocalChecked());
+}
+
 void BindingData::GetPackageScopeConfig(
     const FunctionCallbackInfo<Value>& args) {
   CHECK_GE(args.Length(), 1);
@@ -424,6 +461,7 @@ void BindingData::CreatePerIsolateProperties(IsolateData* isolate_data,
             "getNearestParentPackageJSON",
             GetNearestParentPackageJSON);
   SetMethod(isolate, target, "getPackageScopeConfig", GetPackageScopeConfig);
+  SetMethod(isolate, target, "getPackageJSONScripts", GetPackageJSONScripts);
 }
 
 void BindingData::CreatePerContextProperties(Local<Object> target,
@@ -440,6 +478,7 @@ void BindingData::RegisterExternalReferences(
   registry->Register(GetNearestParentPackageJSONType);
   registry->Register(GetNearestParentPackageJSON);
   registry->Register(GetPackageScopeConfig);
+  registry->Register(GetPackageJSONScripts);
 }
 
 }  // namespace modules
diff --git a/src/node_modules.h b/src/node_modules.h
index 27b2bcb11f56b0..6b47e5711c49cd 100644
--- a/src/node_modules.h
+++ b/src/node_modules.h
@@ -32,6 +32,7 @@ class BindingData : public SnapshotableObject {
     std::string type = "none";
     std::optional<std::string> exports;
     std::optional<std::string> imports;
+    std::optional<std::string> scripts;
     std::string raw_json;
 
     v8::Local<v8::Array> Serialize(Realm* realm) const;
@@ -60,6 +61,8 @@ class BindingData : public SnapshotableObject {
       const v8::FunctionCallbackInfo<v8::Value>& args);
   static void GetPackageScopeConfig(
       const v8::FunctionCallbackInfo<v8::Value>& args);
+  static void GetPackageJSONScripts(
+      const v8::FunctionCallbackInfo<v8::Value>& args);
 
   static void CreatePerIsolateProperties(IsolateData* isolate_data,
                                          v8::Local<v8::ObjectTemplate> ctor);
diff --git a/test/fixtures/run-script/.env b/test/fixtures/run-script/.env
new file mode 100644
index 00000000000000..c9784df76f3f70
--- /dev/null
+++ b/test/fixtures/run-script/.env
@@ -0,0 +1 @@
+CUSTOM_ENV="hello world"
diff --git a/test/fixtures/run-script/node_modules/.bin/ada b/test/fixtures/run-script/node_modules/.bin/ada
new file mode 100755
index 00000000000000..c6acb65ef626ef
--- /dev/null
+++ b/test/fixtures/run-script/node_modules/.bin/ada
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "06062023"
diff --git a/test/fixtures/run-script/node_modules/.bin/custom-env b/test/fixtures/run-script/node_modules/.bin/custom-env
new file mode 100755
index 00000000000000..e6f291c6b2457d
--- /dev/null
+++ b/test/fixtures/run-script/node_modules/.bin/custom-env
@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "$CUSTOM_ENV"
diff --git a/test/fixtures/run-script/node_modules/.bin/positional-args b/test/fixtures/run-script/node_modules/.bin/positional-args
new file mode 100755
index 00000000000000..47d2d7d6a26d93
--- /dev/null
+++ b/test/fixtures/run-script/node_modules/.bin/positional-args
@@ -0,0 +1,2 @@
+#!/bin/bash
+echo $@
diff --git a/test/fixtures/run-script/package.json b/test/fixtures/run-script/package.json
new file mode 100644
index 00000000000000..d468ee1a1905e0
--- /dev/null
+++ b/test/fixtures/run-script/package.json
@@ -0,0 +1,8 @@
+{
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "ada": "ada",
+    "positional-args": "positional-args",
+    "custom-env": "custom-env"
+  }
+}
diff --git a/test/parallel/test-node-run.js b/test/parallel/test-node-run.js
new file mode 100644
index 00000000000000..b1e4bde7b419ec
--- /dev/null
+++ b/test/parallel/test-node-run.js
@@ -0,0 +1,64 @@
+'use strict';
+
+const common = require('../common');
+const { it, describe } = require('node:test');
+const assert = require('node:assert');
+
+const fixtures = require('../common/fixtures');
+
+describe('node run [command]', () => {
+  it('returns error on non-existent command', async () => {
+    const child = await common.spawnPromisified(
+      process.execPath,
+      [ 'run', 'test'],
+      { cwd: __dirname },
+    );
+    assert.match(child.stdout, /Can't read package\.json/);
+    assert.strictEqual(child.stderr, '');
+    assert.strictEqual(child.code, 1);
+  });
+
+  it('runs a valid command', async () => {
+    // Run a script that just log `no test specified`
+    const child = await common.spawnPromisified(
+      process.execPath,
+      [ 'run', 'test'],
+      { cwd: fixtures.path('run-script') },
+    );
+    assert.match(child.stdout, /Error: no test specified/);
+    assert.strictEqual(child.code, 1);
+  });
+
+  it('adds node_modules/.bin to path', async () => {
+    const child = await common.spawnPromisified(
+      process.execPath,
+      [ 'run', 'ada'],
+      { cwd: fixtures.path('run-script') },
+    );
+    assert.match(child.stdout, /06062023/);
+    assert.strictEqual(child.stderr, '');
+    assert.strictEqual(child.code, 0);
+  });
+
+  it('appends positional arguments', async () => {
+    const child = await common.spawnPromisified(
+      process.execPath,
+      [ 'run', 'positional-args', '--help "hello world test"'],
+      { cwd: fixtures.path('run-script') },
+    );
+    assert.match(child.stdout, /--help hello world test/);
+    assert.strictEqual(child.stderr, '');
+    assert.strictEqual(child.code, 0);
+  });
+
+  it('should support having --env-file cli flag', async () => {
+    const child = await common.spawnPromisified(
+      process.execPath,
+      [ `--env-file=${fixtures.path('run-script/.env')}`, 'run', 'custom-env'],
+      { cwd: fixtures.path('run-script') },
+    );
+    assert.match(child.stdout, /hello world/);
+    assert.strictEqual(child.stderr, '');
+    assert.strictEqual(child.code, 0);
+  });
+});
diff --git a/typings/internalBinding/modules.d.ts b/typings/internalBinding/modules.d.ts
index ddbb3d02704908..86efd6c971ae04 100644
--- a/typings/internalBinding/modules.d.ts
+++ b/typings/internalBinding/modules.d.ts
@@ -26,4 +26,5 @@ export interface ModulesBinding {
     string, // raw content
   ]
   getPackageScopeConfig(path: string): SerializedPackageConfig | undefined
+  getPackageJSONScripts(): string | undefined
 }

From bec1d3fa466a1f74d9da5e4cb3c6dc877fbd6299 Mon Sep 17 00:00:00 2001
From: Daniel Lemire <daniel@lemire.me>
Date: Wed, 27 Mar 2024 16:34:12 -0400
Subject: [PATCH 2/3] fix Windows support in tests

---
 .../run-script/node_modules/.bin/ada.bat      |  1 +
 .../node_modules/.bin/custom-env.bat          |  1 +
 .../node_modules/.bin/positional-args.bat     |  2 ++
 test/fixtures/run-script/package.json         |  5 ++++-
 test/parallel/test-node-run.js                | 21 +++++++++++++++----
 5 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 test/fixtures/run-script/node_modules/.bin/ada.bat
 create mode 100644 test/fixtures/run-script/node_modules/.bin/custom-env.bat
 create mode 100644 test/fixtures/run-script/node_modules/.bin/positional-args.bat

diff --git a/test/fixtures/run-script/node_modules/.bin/ada.bat b/test/fixtures/run-script/node_modules/.bin/ada.bat
new file mode 100644
index 00000000000000..18bb1405d22a73
--- /dev/null
+++ b/test/fixtures/run-script/node_modules/.bin/ada.bat
@@ -0,0 +1 @@
+@echo "06062023"
diff --git a/test/fixtures/run-script/node_modules/.bin/custom-env.bat b/test/fixtures/run-script/node_modules/.bin/custom-env.bat
new file mode 100644
index 00000000000000..9597eb0be35958
--- /dev/null
+++ b/test/fixtures/run-script/node_modules/.bin/custom-env.bat
@@ -0,0 +1 @@
+echo %CUSTOM_ENV%
diff --git a/test/fixtures/run-script/node_modules/.bin/positional-args.bat b/test/fixtures/run-script/node_modules/.bin/positional-args.bat
new file mode 100644
index 00000000000000..b95ea66f90851a
--- /dev/null
+++ b/test/fixtures/run-script/node_modules/.bin/positional-args.bat
@@ -0,0 +1,2 @@
+@shift
+@echo %*
diff --git a/test/fixtures/run-script/package.json b/test/fixtures/run-script/package.json
index d468ee1a1905e0..827c815f0e493b 100644
--- a/test/fixtures/run-script/package.json
+++ b/test/fixtures/run-script/package.json
@@ -2,7 +2,10 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "ada": "ada",
+    "ada.bat": "ada.bat",
     "positional-args": "positional-args",
-    "custom-env": "custom-env"
+    "positional-args.bat": "positional-args.bat",
+    "custom-env": "custom-env",
+    "custom-env.bat": "custom-env.bat"
   }
 }
diff --git a/test/parallel/test-node-run.js b/test/parallel/test-node-run.js
index b1e4bde7b419ec..e3bac43307025f 100644
--- a/test/parallel/test-node-run.js
+++ b/test/parallel/test-node-run.js
@@ -29,10 +29,15 @@ describe('node run [command]', () => {
     assert.strictEqual(child.code, 1);
   });
 
+  var adabatch = 'ada';
+  if(common.isWindows) {
+    adabatch = 'ada.bat';
+  }
+
   it('adds node_modules/.bin to path', async () => {
     const child = await common.spawnPromisified(
       process.execPath,
-      [ 'run', 'ada'],
+      [ 'run', adabatch],
       { cwd: fixtures.path('run-script') },
     );
     assert.match(child.stdout, /06062023/);
@@ -40,21 +45,29 @@ describe('node run [command]', () => {
     assert.strictEqual(child.code, 0);
   });
 
+  var posbatch = 'positional-args';
+  if(common.isWindows) {
+    posbatch = 'positional-args.bat';
+  }
   it('appends positional arguments', async () => {
     const child = await common.spawnPromisified(
       process.execPath,
-      [ 'run', 'positional-args', '--help "hello world test"'],
+      [ 'run', posbatch, '--help "hello world test"'],
       { cwd: fixtures.path('run-script') },
     );
-    assert.match(child.stdout, /--help hello world test/);
+    assert.match(child.stdout, /--help ["]*hello world test.*/);
     assert.strictEqual(child.stderr, '');
     assert.strictEqual(child.code, 0);
   });
 
+  var cusbatch = 'custom-env';
+  if(common.isWindows) {
+    cusbatch = 'custom-env.bat';
+  }
   it('should support having --env-file cli flag', async () => {
     const child = await common.spawnPromisified(
       process.execPath,
-      [ `--env-file=${fixtures.path('run-script/.env')}`, 'run', 'custom-env'],
+      [ `--env-file=${fixtures.path('run-script/.env')}`, 'run', cusbatch],
       { cwd: fixtures.path('run-script') },
     );
     assert.match(child.stdout, /hello world/);

From f253c10dd5c972cc1a621b4e5620527d8456916f Mon Sep 17 00:00:00 2001
From: Daniel Lemire <daniel@lemire.me>
Date: Wed, 27 Mar 2024 16:48:49 -0400
Subject: [PATCH 3/3] lint

---
 test/parallel/test-node-run.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/parallel/test-node-run.js b/test/parallel/test-node-run.js
index e3bac43307025f..2513d9f84d1f2e 100644
--- a/test/parallel/test-node-run.js
+++ b/test/parallel/test-node-run.js
@@ -29,8 +29,8 @@ describe('node run [command]', () => {
     assert.strictEqual(child.code, 1);
   });
 
-  var adabatch = 'ada';
-  if(common.isWindows) {
+  let adabatch = 'ada';
+  if (common.isWindows) {
     adabatch = 'ada.bat';
   }
 
@@ -45,8 +45,8 @@ describe('node run [command]', () => {
     assert.strictEqual(child.code, 0);
   });
 
-  var posbatch = 'positional-args';
-  if(common.isWindows) {
+  let posbatch = 'positional-args';
+  if (common.isWindows) {
     posbatch = 'positional-args.bat';
   }
   it('appends positional arguments', async () => {
@@ -60,8 +60,8 @@ describe('node run [command]', () => {
     assert.strictEqual(child.code, 0);
   });
 
-  var cusbatch = 'custom-env';
-  if(common.isWindows) {
+  let cusbatch = 'custom-env';
+  if (common.isWindows) {
     cusbatch = 'custom-env.bat';
   }
   it('should support having --env-file cli flag', async () => {