fix

cli/js.rs

@@ -16,6 +16,19 @@ pub static COMPILER_SNAPSHOT_MAP: &[u8] =
 pub static COMPILER_SNAPSHOT_DTS: &[u8] =
   include_bytes!(concat!(env!("OUT_DIR"), "/COMPILER_SNAPSHOT.d.ts"));
 
+static DENO_RUNTIME: &str = include_str!("js/lib.deno_runtime.d.ts");
+
+/// Same as deno_typescript::get_asset but also has lib.deno_runtime.d.ts
+pub fn get_asset(name: &str) -> Option<&'static str> {
+  // WARNING: The design looks unnessary but has a purpose. deno_typescript
+  // cannot include lib.deno_runtime.d.ts because is not within the
+  // deno_typescript crate.
+  match name {
+    "lib.deno_runtime.d.ts" => Some(DENO_RUNTIME),
+    _ => deno_typescript::get_asset(name),
+  }
+}
+
 #[test]
 fn cli_snapshot() {
   let mut isolate = deno_core::Isolate::new(

cli/lib.rs

@@ -146,7 +146,7 @@ fn create_worker_and_state(
 }
 
 fn types_command() {
-  let content = include_str!("./js/lib.deno_runtime.d.ts");
+  let content = crate::js::get_asset("lib.deno_runtime.d.ts").unwrap();
   println!("{}", content);
 }
 

cli/ops/compiler.rs

@@ -17,6 +17,10 @@ pub fn init(i: &mut Isolate, s: &ThreadSafeState) {
     "fetch_source_files",
     s.core_op(json_op(s.stateful_op(op_fetch_source_files))),
   );
+  i.register_op(
+    "fetch_asset",
+    s.core_op(json_op(s.stateful_op(op_fetch_asset))),
+  );
 }
 
 #[derive(Deserialize)]
@@ -145,3 +149,21 @@ fn op_fetch_source_files(
 
   Ok(JsonOp::Async(future))
 }
+
+#[derive(Deserialize)]
+struct FetchAssetArgs {
+  name: String,
+}
+
+fn op_fetch_asset(
+  _state: &ThreadSafeState,
+  args: Value,
+  _zero_copy: Option<PinnedBuf>,
+) -> Result<JsonOp, ErrBox> {
+  let args: FetchAssetArgs = serde_json::from_value(args)?;
+  if let Some(source_code) = crate::js::get_asset(&args.name) {
+    Ok(JsonOp::Sync(json!(source_code)))
+  } else {
+    panic!("op_fetch_asset bad asset {}", args.name)
+  }
+}

deno_typescript/lib.rs

@@ -203,10 +203,6 @@ pub fn mksnapshot_bundle_ts(
   state: Arc<Mutex<TSState>>,
 ) -> Result<(), ErrBox> {
   let runtime_isolate = &mut Isolate::new(StartupData::None, true);
-  runtime_isolate.register_op(
-    "fetch_asset",
-    compiler_op(state.clone(), ops::json_op(ops::fetch_asset)),
-  );
   let source_code_vec = std::fs::read(bundle)?;
   let source_code = std::str::from_utf8(&source_code_vec)?;
 

deno_typescript/ops.rs

@@ -110,21 +110,6 @@ pub fn resolve_module_names(
   Ok(json!(resolved))
 }
 
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct FetchAssetArgs {
-  name: String,
-}
-
-pub fn fetch_asset(_s: &mut TSState, v: Value) -> Result<Value, ErrBox> {
-  let args: FetchAssetArgs = serde_json::from_value(v)?;
-  if let Some(source_code) = crate::get_asset(&args.name) {
-    Ok(json!(source_code))
-  } else {
-    panic!("op_fetch_asset bad asset {}", args.name)
-  }
-}
-
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct Exit {