fixup!

Author: avivkeller

doc/api/process.md

@@ -1521,8 +1521,9 @@ added: REPLACEME
 
 * Type: {URL | undefined}
 
-The entrypoint that node was instantiated with, or {undefined} if node
-was instantiated without one (e.g., in the REPL).
+The entry point that Node.js was started with. Worker threads inherit this
+value. If Node.js was started without an entry point, such as in the REPL, the
+value is {undefined}.
 
 ## `process.env`
 

lib/internal/main/worker_thread.js

@@ -96,6 +96,7 @@ port.on('message', (message) => {
       argv,
       cwdCounter,
       doEval,
+      entrypoint,
       environmentData,
       filename,
       hasStdin,
@@ -104,6 +105,10 @@ port.on('message', (message) => {
       mainThreadPort,
     } = message;
 
+    const { URL } = require('internal/url');
+    defineEntrypoint(entrypoint === undefined ?
+      undefined : new URL(entrypoint));
+
     if (doEval !== 'internal') {
       if (argv !== undefined) {
         ArrayPrototypePushApply(process.argv, argv);
@@ -134,11 +139,7 @@ port.on('message', (message) => {
     workerIo.sharedCwdCounter = cwdCounter;
 
     const isLoaderHookWorker = (filename === 'internal/modules/esm/worker' && doEval === 'internal');
-    if (isLoaderHookWorker) {
-      const { URL } = require('internal/url');
-      defineEntrypoint(workerData.entrypoint === undefined ?
-        undefined : new URL(workerData.entrypoint));
-    } else {
+    if (!isLoaderHookWorker) {
       // If we are in the loader hook worker, delay the module loader initializations until
       // initializeAsyncLoaderHooksOnLoaderHookWorker() which needs to run preloads
       // after the asynchronous loader hooks are registered.

lib/internal/modules/esm/hooks.js

@@ -530,7 +530,6 @@ class AsyncLoaderHookWorker {
       stdout: false,
       trackUnmanagedFds: false,
       workerData: {
-        entrypoint: process.entrypoint?.href,
         lock,
       },
     });

lib/internal/worker.js

@@ -362,6 +362,7 @@ class Worker extends EventEmitter {
 
     this[kPort].postMessage({
       argv,
+      entrypoint: process.entrypoint?.href,
       type: messageTypes.LOAD_SCRIPT,
       filename,
       doEval,

test/fixtures/entrypoint/worker.cjs

@@ -0,0 +1,9 @@
+'use strict';
+
+const { isMainThread, workerData, Worker } = require('node:worker_threads');
+
+if (isMainThread || workerData === 'nested') {
+  new Worker(__filename, { workerData: isMainThread ? 'nested' : 'leaf' });
+} else {
+  console.log(process.entrypoint.href);
+}

test/parallel/test-process-entrypoint.js

@@ -13,6 +13,9 @@ const cjsFixtureURL = fixtures.fileURL('entrypoint', 'commonjs.cjs').href;
 const mjsFixture = fixtures.path('entrypoint', 'module.mjs');
 const mjsFixtureURL = fixtures.fileURL('entrypoint', 'module.mjs').href;
 
+const workerFixture = fixtures.path('entrypoint', 'worker.cjs');
+const workerFixtureURL = fixtures.fileURL('entrypoint', 'worker.cjs').href;
+
 const cjsPreload = fixtures.path('entrypoint', 'check-commonjs.cjs');
 const esmPreload = fixtures.fileURL('entrypoint', 'check-module.mjs').href;
 const loader = fixtures.fileURL('entrypoint', 'loader.mjs').href;
@@ -79,6 +82,16 @@ const testCases = [
     ],
     expected: mjsFixtureURL,
   },
+  {
+    name: 'is inherited by worker threads and their preloads and loaders',
+    args: [
+      '--require', cjsPreload,
+      '--import', esmPreload,
+      '--loader', loader,
+      workerFixture,
+    ],
+    expected: workerFixtureURL,
+  },
   {
     name: 'supports non-file --entry-url entry points',
     args: ['--entry-url', `data:text/javascript,${printEntrypoint}`],