fixup!

Author: avivkeller

doc/api/process.md

@@ -1519,11 +1519,11 @@ emitMyWarning();
 added: REPLACEME
 -->
 
-* Type: {URL | undefined}
+* Type: {string | undefined}
 
-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}.
+The URL of the entry point that Node.js was started with, such as
+`'file:///path/to/app.js'`. 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

@@ -105,9 +105,7 @@ port.on('message', (message) => {
       mainThreadPort,
     } = message;
 
-    const { URL } = require('internal/url');
-    defineEntrypoint(entrypoint === undefined ?
-      undefined : new URL(entrypoint));
+    defineEntrypoint(() => entrypoint);
 
     if (doEval !== 'internal') {
       if (argv !== undefined) {

lib/internal/process/pre_execution.js

@@ -255,13 +255,22 @@ function refreshRuntimeOptions() {
   refreshOptions();
 }
 
-function defineEntrypoint(entrypoint) {
+function defineEntrypoint(computeEntrypoint) {
+  let entrypoint;
+  let computed = false;
+
   ObjectDefineProperty(process, 'entrypoint', {
     __proto__: null,
-    writable: false,
     enumerable: true,
     configurable: true,
-    value: entrypoint,
+    get() {
+      if (!computed) {
+        entrypoint = computeEntrypoint();
+        computed = true;
+      }
+      return entrypoint;
+    },
+    set: undefined,
   });
 }
 
@@ -305,15 +314,18 @@ function patchProcessObject(expandArgv1) {
     }
   }
 
-  let entrypoint;
-  if (mainEntry !== undefined) {
-    const { pathToFileURL } = require('internal/url');
-    entrypoint = pathToFileURL(mainEntry);
-  } else if (getOptionValue('--entry-url') && process.argv[1]) {
-    const { URL } = require('internal/url');
-    entrypoint = new URL(process.argv[1], getCWDURL());
-  }
-  defineEntrypoint(entrypoint);
+  const entryArg = process.argv[1];
+  defineEntrypoint(() => {
+    if (mainEntry !== undefined) {
+      const { pathToFileURL } = require('internal/url');
+      return pathToFileURL(mainEntry).href;
+    }
+    if (entryArg && getOptionValue('--entry-url')) {
+      const { URL } = require('internal/url');
+      return new URL(entryArg, getCWDURL()).href;
+    }
+    return undefined;
+  });
 
   // We need to initialize the global console here again with process.stdout
   // and friends for snapshot deserialization.

lib/internal/worker.js

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

test/fixtures/entrypoint/check-commonjs.cjs

@@ -2,4 +2,4 @@
 
 const assert = require('node:assert');
 
-assert.strictEqual(process.entrypoint.href, process.env.NODE_TEST_ENTRYPOINT);
+assert.strictEqual(process.entrypoint, process.env.NODE_TEST_ENTRYPOINT);

test/fixtures/entrypoint/check-module.mjs

@@ -1,4 +1,4 @@
 import assert from 'node:assert';
 import { entrypoint } from 'node:process';
 
-assert.strictEqual(entrypoint.href, process.env.NODE_TEST_ENTRYPOINT);
+assert.strictEqual(entrypoint, process.env.NODE_TEST_ENTRYPOINT);

test/fixtures/entrypoint/commonjs.cjs

@@ -1 +1 @@
-console.log(process.entrypoint.href);
+console.log(process.entrypoint);

test/fixtures/entrypoint/loader.mjs

@@ -1,4 +1,4 @@
 import assert from 'node:assert';
 import { entrypoint } from 'node:process';
 
-assert.strictEqual(entrypoint.href, process.env.NODE_TEST_ENTRYPOINT);
+assert.strictEqual(entrypoint, process.env.NODE_TEST_ENTRYPOINT);

test/fixtures/entrypoint/module.mjs

@@ -1 +1 @@
-console.log(process.entrypoint.href);
+console.log(process.entrypoint);

test/fixtures/entrypoint/worker.cjs

@@ -5,5 +5,5 @@ 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);
+  console.log(process.entrypoint);
 }