refactor: don't use deno.core.ops in jupyter,bench,test,lint

Cargo.toml

@@ -48,7 +48,7 @@ repository = "https://github.com/denoland/deno"
 
 [workspace.dependencies]
 deno_ast = { version = "=0.44.0", features = ["transpiling"] }
-deno_core = { version = "0.327.0" }
+deno_core = { version = "0.327.0", git = "https://github.com/nathanwhit/deno_core", branch = "execute-virtual-ops-module" }
 
 deno_bench_util = { version = "0.178.0", path = "./bench_util" }
 deno_config = { version = "=0.41.0", features = ["workspace", "sync"] }

cli/args/flags.rs

@@ -490,18 +490,6 @@ impl DenoSubcommand {
   pub fn is_run(&self) -> bool {
     matches!(self, Self::Run(_))
   }
-
-  // Returns `true` if the subcommand depends on testing infrastructure.
-  pub fn needs_test(&self) -> bool {
-    matches!(
-      self,
-      Self::Test(_)
-        | Self::Jupyter(_)
-        | Self::Repl(_)
-        | Self::Bench(_)
-        | Self::Lsp
-    )
-  }
 }
 
 impl Default for DenoSubcommand {

cli/js/40_bench.js

@@ -1,6 +1,12 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 // deno-lint-ignore-file
 
+import {
+  op_bench_get_origin,
+  op_bench_now,
+  op_dispatch_bench_event,
+  op_register_bench,
+} from "ext:core/ops";
 import { core, primordials } from "ext:core/mod.js";
 import {
   escapeName,
@@ -9,12 +15,6 @@ import {
 } from "ext:cli/40_test_common.js";
 import { Console } from "ext:deno_console/01_console.js";
 import { setExitHandler } from "ext:runtime/30_os.js";
-const {
-  op_register_bench,
-  op_bench_get_origin,
-  op_dispatch_bench_event,
-  op_bench_now,
-} = core.ops;
 const {
   ArrayPrototypePush,
   Error,

cli/js/40_jupyter.js

@@ -36,7 +36,12 @@
  * }, { raw: true });
  * ```
  */
-import { core, internals } from "ext:core/mod.js";
+import { internals } from "ext:core/mod.js";
+import {
+  op_base64_encode,
+  op_jupyter_broadcast,
+  op_jupyter_input,
+} from "ext:core/ops";
 
 const $display = Symbol.for("Jupyter.display");
 
@@ -281,12 +286,12 @@ async function format(obj) {
   }
   if (isJpg(obj)) {
     return {
-      "image/jpeg": core.ops.op_base64_encode(obj),
+      "image/jpeg": op_base64_encode(obj),
     };
   }
   if (isPng(obj)) {
     return {
-      "image/png": core.ops.op_base64_encode(obj),
+      "image/png": op_base64_encode(obj),
     };
   }
   if (isSVGElementLike(obj)) {
@@ -380,11 +385,11 @@ function image(obj) {
   }
 
   if (isJpg(obj)) {
-    return makeDisplayable({ "image/jpeg": core.ops.op_base64_encode(obj) });
+    return makeDisplayable({ "image/jpeg": op_base64_encode(obj) });
   }
 
   if (isPng(obj)) {
-    return makeDisplayable({ "image/png": core.ops.op_base64_encode(obj) });
+    return makeDisplayable({ "image/png": op_base64_encode(obj) });
   }
 
   throw new TypeError(
@@ -415,8 +420,6 @@ async function formatInner(obj, raw) {
 internals.jupyter = { formatInner };
 
 function enableJupyter() {
-  const { op_jupyter_broadcast, op_jupyter_input } = core.ops;
-
   function input(
     prompt,
     password,

cli/js/40_test.js

@@ -3,16 +3,16 @@
 import { core, primordials } from "ext:core/mod.js";
 import { escapeName, withPermissions } from "ext:cli/40_test_common.js";
 
-// TODO(mmastrac): We cannot import these from "ext:core/ops" yet
-const {
-  op_register_test_step,
+import {
   op_register_test,
+  op_register_test_step,
   op_test_event_step_result_failed,
   op_test_event_step_result_ignored,
   op_test_event_step_result_ok,
   op_test_event_step_wait,
   op_test_get_origin,
-} = core.ops;
+} from "ext:core/ops";
+
 const {
   ArrayPrototypeFilter,
   ArrayPrototypePush,

cli/js/40_test_common.js

@@ -1,4 +1,8 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
+import {
+  op_pledge_test_permissions,
+  op_restore_test_permissions,
+} from "ext:core/ops";
 import { core, primordials } from "ext:core/mod.js";
 import { serializePermissions } from "ext:runtime/10_permissions.js";
 const ops = core.ops;
@@ -38,13 +42,13 @@ export function escapeName(name) {
 }
 
 export function pledgePermissions(permissions) {
-  return ops.op_pledge_test_permissions(
+  return op_pledge_test_permissions(
     serializePermissions(permissions),
   );
 }
 
 export function restorePermissions(token) {
-  ops.op_restore_test_permissions(token);
+  op_restore_test_permissions(token);
 }
 
 export function withPermissions(fn, permissions) {

cli/ops/jupyter.rs

@@ -24,6 +24,7 @@ use tokio::sync::mpsc;
 use crate::tools::jupyter::server::StdinConnectionProxy;
 
 deno_core::extension!(deno_jupyter,
+  deps = [deno_web],
   ops = [
     op_jupyter_broadcast,
     op_jupyter_input,

cli/ops/testing.rs

@@ -40,7 +40,7 @@ deno_core::extension!(deno_test,
   state = |state, options| {
     state.put(options.sender);
     state.put(TestContainer::default());
-  },
+  }
 );
 
 #[derive(Clone)]

cli/worker.rs

@@ -643,24 +643,32 @@ impl CliMainWorkerFactory {
       options,
     );
 
-    if self.shared.subcommand.needs_test() {
-      macro_rules! test_file {
-        ($($file:literal),*) => {
-          $(worker.js_runtime.lazy_load_es_module_with_code(
-            concat!("ext:cli/", $file),
-            deno_core::ascii_str_include!(concat!("js/", $file)),
-          )?;)*
-        }
+    macro_rules! test_file {
+      ($($file:literal),*) => {
+        $(worker.js_runtime.lazy_load_es_module_with_code(
+          concat!("ext:cli/", $file),
+          deno_core::ascii_str_include!(concat!("js/", $file)),
+        )?;)*
+      }
+    }
+    match &self.shared.subcommand {
+      DenoSubcommand::Test(_) => {
+        test_file!("40_test_common.js", "40_test.js");
+      }
+      DenoSubcommand::Bench(_) => {
+        test_file!("40_test_common.js", "40_bench.js");
+      }
+      DenoSubcommand::Jupyter(_) => {
+        test_file!("40_test_common.js", "40_test.js", "40_jupyter.js");
+      }
+
+      DenoSubcommand::Repl(_) => {
+        test_file!("40_test_common.js", "40_test.js");
+      }
+      DenoSubcommand::Lint(_) => {
+        test_file!("40_lint_selector.js", "40_lint.js");
       }
-      test_file!(
-        "40_test_common.js",
-        "40_test.js",
-        "40_bench.js",
-        "40_jupyter.js",
-        // TODO(bartlomieju): probably shouldn't include these files here?
-        "40_lint_selector.js",
-        "40_lint.js"
-      );
+      _ => {}
     }
 
     Ok(CliMainWorker {

runtime/js/99_main.js

@@ -515,33 +515,33 @@ function shimTemporalDurationToLocaleString() {
 // "virtual op module" (`ext:core/ops`).
 const NOT_IMPORTED_OPS = [
   // Related to `Deno.bench()` API
-  "op_bench_now",
-  "op_dispatch_bench_event",
-  "op_register_bench",
-  "op_bench_get_origin",
+  // "op_bench_now",
+  // "op_dispatch_bench_event",
+  // "op_register_bench",
+  // "op_bench_get_origin",
 
   // Related to `Deno.jupyter` API
-  "op_jupyter_broadcast",
-  "op_jupyter_input",
+  // "op_jupyter_broadcast",
+  // "op_jupyter_input",
   // Used in jupyter API
   "op_base64_encode",
 
   // Used in the lint API
   "op_lint_create_serialized_ast",
 
   // Related to `Deno.test()` API
-  "op_test_event_step_result_failed",
-  "op_test_event_step_result_ignored",
-  "op_test_event_step_result_ok",
-  "op_test_event_step_wait",
-  "op_test_op_sanitizer_collect",
-  "op_test_op_sanitizer_finish",
-  "op_test_op_sanitizer_get_async_message",
-  "op_test_op_sanitizer_report",
-  "op_restore_test_permissions",
-  "op_register_test_step",
-  "op_register_test",
-  "op_test_get_origin",
+  // "op_test_event_step_result_failed",
+  // "op_test_event_step_result_ignored",
+  // "op_test_event_step_result_ok",
+  // "op_test_event_step_wait",
+  // "op_test_op_sanitizer_collect",
+  // "op_test_op_sanitizer_finish",
+  // "op_test_op_sanitizer_get_async_message",
+  // "op_test_op_sanitizer_report",
+  // "op_restore_test_permissions",
+  // "op_register_test_step",
+  // "op_register_test",
+  // "op_test_get_origin",
   "op_pledge_test_permissions",
 
   // TODO(bartlomieju): used in various integration tests - figure out a way