From 4416cc0df40fa979ba893fd3efd792ce2a50ada6 Mon Sep 17 00:00:00 2001
From: Mert Can Altin <mertgold60@gmail.com>
Date: Fri, 21 Mar 2025 23:13:41 +0300
Subject: [PATCH 01/10] src: add --run-from runtime flag

---
 doc/api/cli.md                 | 16 +++++++++++++
 src/node_options.cc            |  3 +++
 src/node_options.h             |  1 +
 src/node_task_runner.cc        | 11 ++++++++-
 test/parallel/test-node-run.js | 42 ++++++++++++++++++++++++++++++++++
 5 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 63e68244e75d7d..b08834510d4045 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -2294,6 +2294,22 @@ The following environment variables are set when running a script with `--run`:
 * `NODE_RUN_PACKAGE_JSON_PATH`: The path to the `package.json` that is being
   processed.
 
+### `--run-from=<dir>`
+
+<!-- YAML
+added: REPLACEME
+-->
+
+> Stability: 1.0 - Early development
+
+Run a script defined in the package.json located in the specified directory.
+
+For example:
+
+```bash
+node --run-from=/path/to/dir --run test
+```
+
 ### `--secure-heap-min=n`
 
 <!-- YAML
diff --git a/src/node_options.cc b/src/node_options.cc
index 16cce0df0e2263..45ba3b5d3f4749 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -1216,6 +1216,9 @@ PerProcessOptionsParser::PerProcessOptionsParser(
   AddOption("--run",
             "Run a script specified in package.json",
             &PerProcessOptions::run);
+  AddOption("--run-from",
+            "Run a package.json script in a specific working directory",
+            &PerProcessOptions::run_from);
   AddOption(
       "--disable-wasm-trap-handler",
       "Disable trap-handler-based WebAssembly bound checks. V8 will insert "
diff --git a/src/node_options.h b/src/node_options.h
index baa615e310e17b..4b39419b3e224e 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -327,6 +327,7 @@ class PerProcessOptions : public Options {
   bool print_version = false;
   std::string experimental_sea_config;
   std::string run;
+  std::string run_from;
 
 #ifdef NODE_HAVE_I18N_SUPPORT
   std::string icu_data_dir;
diff --git a/src/node_task_runner.cc b/src/node_task_runner.cc
index efaf6f01b3fbf9..64417f56acbd8b 100644
--- a/src/node_task_runner.cc
+++ b/src/node_task_runner.cc
@@ -206,7 +206,16 @@ void ProcessRunner::OnExit(int64_t exit_status, int term_signal) {
 
 void ProcessRunner::Run() {
   // keeps the string alive until destructor
-  cwd = package_json_path_.parent_path().string();
+  if (!node::per_process::cli_options->run_from.empty()) {
+    cwd = node::per_process::cli_options->run_from;
+    if (!std::filesystem::is_directory(cwd)) {
+      fprintf(stderr, "Error: %s is not a directory\n", cwd.c_str());
+      init_result->exit_code_ = ExitCode::kGenericUserError;
+      return;
+    }
+  } else {
+    cwd = package_json_path_.parent_path().string();
+  }
   options_.cwd = cwd.c_str();
   if (int r = uv_spawn(loop_, &process_, &options_)) {
     fprintf(stderr, "Error: %s\n", uv_strerror(r));
diff --git a/test/parallel/test-node-run.js b/test/parallel/test-node-run.js
index 26295256849702..7c3f0eaf5e3bd2 100644
--- a/test/parallel/test-node-run.js
+++ b/test/parallel/test-node-run.js
@@ -222,4 +222,46 @@ describe('node --run [command]', () => {
     assert.strictEqual(child.stdout, '');
     assert.strictEqual(child.code, 1);
   });
+
+  it('runs script in a custom working directory using --run-from', async () => {
+    const customDir = fixtures.path('run-script');
+    const child = await common.spawnPromisified(
+      process.execPath,
+      [ '--run-from', customDir, '--run', `pwd${envSuffix}` ],
+
+      { cwd: fixtures.path('run-script/sub-directory') }
+    );
+
+    assert.strictEqual(child.stdout.trim(), customDir);
+    assert.strictEqual(child.stderr, '');
+    assert.strictEqual(child.code, 0);
+  });
+
+  it('returns error on non-directory path for --run-from', async () => {
+    const nonDirPath = fixtures.path('run-script/package.json');
+
+    const child = await common.spawnPromisified(
+      process.execPath,
+      [ '--run-from', nonDirPath, '--run', 'pwd' ],
+      { cwd: fixtures.path('run-script') }
+    );
+
+    assert.match(child.stderr, /not a directory/);
+    assert.strictEqual(child.stdout, '');
+    assert.strictEqual(child.code, 1);
+  });
+
+  it('--run-from should be no-op when used without --run', async () => {
+    const dirPath = fixtures.path('run-script/package.json');
+
+    const child = await common.spawnPromisified(
+      process.execPath,
+      [ '--run-from', dirPath, '--print', 'process.cwd()' ],
+      { cwd: process.cwd() }
+    );
+
+    assert.strictEqual(child.stderr, '');
+    assert.strictEqual(child.stdout, process.cwd() + '\n');
+    assert.strictEqual(child.code, 0);
+  });
 });

From b93de16d4c4c9e5efafa7fac24a30f2a0691c7e3 Mon Sep 17 00:00:00 2001
From: Mert Can Altin <mertgold60@gmail.com>
Date: Sat, 22 Mar 2025 00:36:18 +0300
Subject: [PATCH 02/10] update --run-from tests for package.json file path
 handling

---
 src/node_task_runner.cc        | 19 +++++++++++++++++--
 test/parallel/test-node-run.js | 16 ++++++++--------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/node_task_runner.cc b/src/node_task_runner.cc
index 64417f56acbd8b..b21f42259480d8 100644
--- a/src/node_task_runner.cc
+++ b/src/node_task_runner.cc
@@ -209,13 +209,28 @@ void ProcessRunner::Run() {
   if (!node::per_process::cli_options->run_from.empty()) {
     cwd = node::per_process::cli_options->run_from;
     if (!std::filesystem::is_directory(cwd)) {
-      fprintf(stderr, "Error: %s is not a directory\n", cwd.c_str());
+      // If the given path is a file and the file name is package.json, the parent directory is used
+      if (std::filesystem::is_regular_file(cwd) &&
+          std::filesystem::path(cwd).filename() == "package.json") {
+        cwd = std::filesystem::path(cwd).parent_path().string();
+      } else {
+        fprintf(stderr, "Error: %s is not a directory\n", cwd.c_str());
+        init_result->exit_code_ = ExitCode::kGenericUserError;
+        return;
+      }
+    }
+
+    std::error_code ec;
+    std::filesystem::current_path(cwd, ec);
+    if (ec) {
+      fprintf(stderr, "Error: unable to change directory to %s: %s\n", 
+              cwd.c_str(), ec.message().c_str());
       init_result->exit_code_ = ExitCode::kGenericUserError;
       return;
     }
   } else {
     cwd = package_json_path_.parent_path().string();
-  }
+  }  
   options_.cwd = cwd.c_str();
   if (int r = uv_spawn(loop_, &process_, &options_)) {
     fprintf(stderr, "Error: %s\n", uv_strerror(r));
diff --git a/test/parallel/test-node-run.js b/test/parallel/test-node-run.js
index 7c3f0eaf5e3bd2..913b022236ad01 100644
--- a/test/parallel/test-node-run.js
+++ b/test/parallel/test-node-run.js
@@ -237,18 +237,18 @@ describe('node --run [command]', () => {
     assert.strictEqual(child.code, 0);
   });
 
-  it('returns error on non-directory path for --run-from', async () => {
-    const nonDirPath = fixtures.path('run-script/package.json');
-
+  it('runs script in a custom working directory when --run-from is provided as a package.json file path', async () => {
+    const pkgFilePath = fixtures.path('run-script/package.json');
+    const expectedDir = fixtures.path('run-script');
     const child = await common.spawnPromisified(
       process.execPath,
-      [ '--run-from', nonDirPath, '--run', 'pwd' ],
-      { cwd: fixtures.path('run-script') }
+      [ '--run-from', pkgFilePath, '--run', 'pwd' ],
+      { cwd: fixtures.path('run-script/sub-directory') }
     );
 
-    assert.match(child.stderr, /not a directory/);
-    assert.strictEqual(child.stdout, '');
-    assert.strictEqual(child.code, 1);
+    assert.strictEqual(child.stdout.trim(), expectedDir);
+    assert.strictEqual(child.stderr, '');
+    assert.strictEqual(child.code, 0);
   });
 
   it('--run-from should be no-op when used without --run', async () => {

From d08981b8b5c4158289692e0a7d917c6e3c521582 Mon Sep 17 00:00:00 2001
From: Mert Can Altin <mertgold60@gmail.com>
Date: Sat, 22 Mar 2025 00:48:08 +0300
Subject: [PATCH 03/10] lint

---
 src/node_task_runner.cc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/node_task_runner.cc b/src/node_task_runner.cc
index b21f42259480d8..78b3c8717e7755 100644
--- a/src/node_task_runner.cc
+++ b/src/node_task_runner.cc
@@ -209,7 +209,8 @@ void ProcessRunner::Run() {
   if (!node::per_process::cli_options->run_from.empty()) {
     cwd = node::per_process::cli_options->run_from;
     if (!std::filesystem::is_directory(cwd)) {
-      // If the given path is a file and the file name is package.json, the parent directory is used
+      // If the given path is a file and the file name is package.json, the
+      // parent directory is used
       if (std::filesystem::is_regular_file(cwd) &&
           std::filesystem::path(cwd).filename() == "package.json") {
         cwd = std::filesystem::path(cwd).parent_path().string();
@@ -223,14 +224,16 @@ void ProcessRunner::Run() {
     std::error_code ec;
     std::filesystem::current_path(cwd, ec);
     if (ec) {
-      fprintf(stderr, "Error: unable to change directory to %s: %s\n", 
-              cwd.c_str(), ec.message().c_str());
+      fprintf(stderr,
+              "Error: unable to change directory to %s: %s\n",
+              cwd.c_str(),
+              ec.message().c_str());
       init_result->exit_code_ = ExitCode::kGenericUserError;
       return;
     }
   } else {
     cwd = package_json_path_.parent_path().string();
-  }  
+  }
   options_.cwd = cwd.c_str();
   if (int r = uv_spawn(loop_, &process_, &options_)) {
     fprintf(stderr, "Error: %s\n", uv_strerror(r));

From f37413002e4830dcfe5c8fac06c083fb8f435a79 Mon Sep 17 00:00:00 2001
From: Mert Can Altin <mertgold60@gmail.com>
Date: Sat, 22 Mar 2025 00:50:25 +0300
Subject: [PATCH 04/10] optimized if condition

---
 src/node_task_runner.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/node_task_runner.cc b/src/node_task_runner.cc
index 78b3c8717e7755..92737e6a98591e 100644
--- a/src/node_task_runner.cc
+++ b/src/node_task_runner.cc
@@ -211,9 +211,10 @@ void ProcessRunner::Run() {
     if (!std::filesystem::is_directory(cwd)) {
       // If the given path is a file and the file name is package.json, the
       // parent directory is used
-      if (std::filesystem::is_regular_file(cwd) &&
-          std::filesystem::path(cwd).filename() == "package.json") {
-        cwd = std::filesystem::path(cwd).parent_path().string();
+      std::filesystem::path p(cwd);
+      if (std::filesystem::is_regular_file(p) &&
+          p.filename() == "package.json") {
+        cwd = p.parent_path().string();
       } else {
         fprintf(stderr, "Error: %s is not a directory\n", cwd.c_str());
         init_result->exit_code_ = ExitCode::kGenericUserError;

From 94717dd6c6acad6bac8426973f0bdaed140a619a Mon Sep 17 00:00:00 2001
From: Mert Can Altin <mertgold60@gmail.com>
Date: Sat, 22 Mar 2025 01:59:42 +0300
Subject: [PATCH 05/10] Update cli.md

Co-authored-by: Geoffrey Booth <webadmin@geoffreybooth.com>
---
 doc/api/cli.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index b08834510d4045..4dbb1cf7e465c1 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -2294,7 +2294,7 @@ The following environment variables are set when running a script with `--run`:
 * `NODE_RUN_PACKAGE_JSON_PATH`: The path to the `package.json` that is being
   processed.
 
-### `--run-from=<dir>`
+### `--run-from=<path>`
 
 <!-- YAML
 added: REPLACEME
@@ -2302,13 +2302,13 @@ added: REPLACEME
 
 > Stability: 1.0 - Early development
 
-Run a script defined in the package.json located in the specified directory.
-
-For example:
+Run a `package.json` script from a specified path to a `package.json` file
+or path to the containing folder of a `package.json` file.
 
 ```bash
-node --run-from=/path/to/dir --run test
-```
+node --run-from=/app/package.json --run test
+# Or
+node --run-from=/app/ --run test
 
 ### `--secure-heap-min=n`
 

From 6e5d7d571751b62e50389057d8af4bf87aa9eb4f Mon Sep 17 00:00:00 2001
From: Mert Can Altin <mertgold60@gmail.com>
Date: Sat, 22 Mar 2025 02:07:25 +0300
Subject: [PATCH 06/10] Update cli.md

Co-authored-by: Geoffrey Booth <webadmin@geoffreybooth.com>
---
 doc/api/cli.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 4dbb1cf7e465c1..e871235f78104e 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -2305,6 +2305,8 @@ added: REPLACEME
 Run a `package.json` script from a specified path to a `package.json` file
 or path to the containing folder of a `package.json` file.
 
+The script is run from the current working directory, not from the
+`package.json` containing folder.
 ```bash
 node --run-from=/app/package.json --run test
 # Or

From 7b23a7d7e84ba253855d13de16787c6116750fb1 Mon Sep 17 00:00:00 2001
From: Mert Can Altin <mertgold60@gmail.com>
Date: Sat, 22 Mar 2025 02:12:57 +0300
Subject: [PATCH 07/10] added backtick

---
 doc/api/cli.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index e871235f78104e..3b500955ddb745 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -2311,6 +2311,7 @@ The script is run from the current working directory, not from the
 node --run-from=/app/package.json --run test
 # Or
 node --run-from=/app/ --run test
+```
 
 ### `--secure-heap-min=n`
 

From 6194d3da1b58713d459279c7b613cbf85f942521 Mon Sep 17 00:00:00 2001
From: Mert Can Altin <mertgold60@gmail.com>
Date: Sat, 22 Mar 2025 03:35:05 +0300
Subject: [PATCH 08/10] refactored

---
 src/node_task_runner.cc | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/node_task_runner.cc b/src/node_task_runner.cc
index 92737e6a98591e..437253746f2f19 100644
--- a/src/node_task_runner.cc
+++ b/src/node_task_runner.cc
@@ -222,16 +222,6 @@ void ProcessRunner::Run() {
       }
     }
 
-    std::error_code ec;
-    std::filesystem::current_path(cwd, ec);
-    if (ec) {
-      fprintf(stderr,
-              "Error: unable to change directory to %s: %s\n",
-              cwd.c_str(),
-              ec.message().c_str());
-      init_result->exit_code_ = ExitCode::kGenericUserError;
-      return;
-    }
   } else {
     cwd = package_json_path_.parent_path().string();
   }

From fc6a4381a44197c8d2a8889f4253ff136c2f2f50 Mon Sep 17 00:00:00 2001
From: Mert Can Altin <mertgold60@gmail.com>
Date: Sat, 22 Mar 2025 03:40:55 +0300
Subject: [PATCH 09/10] lint md

---
 doc/api/cli.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 3b500955ddb745..509b2cc252d635 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -2307,6 +2307,7 @@ or path to the containing folder of a `package.json` file.
 
 The script is run from the current working directory, not from the
 `package.json` containing folder.
+
 ```bash
 node --run-from=/app/package.json --run test
 # Or

From d4aa938d4c399ad0f64f3072f546e64485dc3b69 Mon Sep 17 00:00:00 2001
From: Mert Can Altin <mertgold60@gmail.com>
Date: Sat, 22 Mar 2025 03:47:06 +0300
Subject: [PATCH 10/10] refactored

---
 src/node_task_runner.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/node_task_runner.cc b/src/node_task_runner.cc
index 437253746f2f19..e12fd51e91abae 100644
--- a/src/node_task_runner.cc
+++ b/src/node_task_runner.cc
@@ -221,7 +221,12 @@ void ProcessRunner::Run() {
         return;
       }
     }
-
+    // Adding node_modules/.bin under cwd to PATH environment variable
+    std::filesystem::path nmBin =
+        std::filesystem::path(cwd) / "node_modules" / ".bin";
+    if (std::filesystem::is_directory(nmBin)) {
+      path_env_var_ = nmBin.string() + env_var_separator + path_env_var_;
+    }
   } else {
     cwd = package_json_path_.parent_path().string();
   }