update

Author: CyanChanges

cli/tools/repl/session.rs

@@ -1,6 +1,5 @@
 // Copyright 2018-2025 the Deno authors. MIT license.
 
-use std::cell::RefCell;
 use std::sync::Arc;
 
 use deno_ast::diagnostics::Diagnostic;
@@ -84,11 +83,6 @@ fn comment_source_to_position_range(
   }
 }
 
-thread_local! {
-  /// We store functions used in the repl on this object because
-  /// the user might modify the `Deno` global or delete it outright.
-  pub static REPL_INTERNAL_OBJECT_ID: RefCell<Option<RemoteObjectId>> = const { RefCell::new(None) };
-}
 fn get_prelude() -> String {
   r#"(() => {
   const repl_internal = {
@@ -177,6 +171,7 @@ struct ReplJsxState {
 }
 
 pub struct ReplSession {
+  internal_object_id: Option<RemoteObjectId>,
   npm_installer: Option<Arc<NpmInstaller>>,
   resolver: Arc<CliResolver>,
   pub worker: MainWorker,
@@ -264,6 +259,7 @@ impl ReplSession {
       .transpile
       .use_ts_decorators;
     let mut repl_session = ReplSession {
+      internal_object_id: None,
       npm_installer,
       resolver,
       worker,
@@ -294,7 +290,7 @@ impl ReplSession {
 
     // inject prelude
     let evaluated = repl_session.evaluate_expression(&get_prelude()).await?;
-    REPL_INTERNAL_OBJECT_ID.replace(evaluated.result.object_id);
+    repl_session.internal_object_id = evaluated.result.object_id;
 
     Ok(repl_session)
   }
@@ -308,7 +304,7 @@ impl ReplSession {
 
   pub async fn closing(&mut self) -> Result<bool, AnyError> {
     let result = self
-      .call_function_on_args_internal(
+      .call_function_on_repl_internal_obj(
         r#"function () { return this.closed; }"#.to_string(),
         &[],
       )
@@ -503,7 +499,7 @@ impl ReplSession {
           function_declaration:
             r#"function (object) { this.lastThrownError = object; }"#
               .to_string(),
-          object_id: REPL_INTERNAL_OBJECT_ID.with_borrow(Clone::clone),
+          object_id: self.internal_object_id.clone(),
           arguments: Some(vec![error.into()]),
           silent: None,
           return_by_value: None,
@@ -529,7 +525,7 @@ impl ReplSession {
         "Runtime.callFunctionOn",
         Some(cdp::CallFunctionOnArgs {
           function_declaration: r#"function (object) { this.lastEvalResult = object; }"#.to_string(),
-          object_id: REPL_INTERNAL_OBJECT_ID.with_borrow(Clone::clone),
+          object_id: self.internal_object_id.clone(),
           arguments: Some(vec![evaluate_result.into()]),
           silent: None,
           return_by_value: None,
@@ -581,7 +577,7 @@ impl ReplSession {
     Ok(response)
   }
 
-  pub async fn call_function_on_args_internal(
+  pub async fn call_function_on_repl_internal_obj(
     &mut self,
     function_declaration: String,
     args: &[cdp::RemoteObject],
@@ -597,7 +593,7 @@ impl ReplSession {
         "Runtime.callFunctionOn",
         Some(cdp::CallFunctionOnArgs {
           function_declaration,
-          object_id: REPL_INTERNAL_OBJECT_ID.with_borrow(Clone::clone),
+          object_id: self.internal_object_id.clone(),
           arguments,
           silent: None,
           return_by_value: None,
@@ -624,7 +620,7 @@ impl ReplSession {
     // consistent with the previous implementation we just get the preview result from
     // Deno.inspectArgs.
     let response = self
-      .call_function_on_args_internal(
+      .call_function_on_repl_internal_obj(
         r#"function (object) {
           try {
             return this.inspectArgs(["%o", object], { colors: !this.noColor });