From 32cbcfe4e9943a0318c497188e045d23c5f6703a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Sun, 12 Jan 2020 14:53:32 +0100
Subject: [PATCH] don't include assets in binary (#3661)

---
 cli/lib.rs             |  2 +-
 deno_typescript/lib.rs | 31 +++++++++++++++++++------------
 deno_typescript/ops.rs |  2 +-
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/cli/lib.rs b/cli/lib.rs
index 1b906e6205..a57f224e20 100644
--- a/cli/lib.rs
+++ b/cli/lib.rs
@@ -146,7 +146,7 @@ fn create_worker_and_state(
 }
 
 fn types_command() {
-  let content = deno_typescript::get_asset("lib.deno_runtime.d.ts").unwrap();
+  let content = include_str!("./js/lib.deno_runtime.d.ts");
   println!("{}", content);
 }
 
diff --git a/deno_typescript/lib.rs b/deno_typescript/lib.rs
index a9083b86dd..779e6fd70c 100644
--- a/deno_typescript/lib.rs
+++ b/deno_typescript/lib.rs
@@ -242,7 +242,7 @@ fn write_snapshot(
 }
 
 /// Same as get_asset() but returns NotFound intead of None.
-pub fn get_asset2(name: &str) -> Result<&'static str, ErrBox> {
+pub fn get_asset2(name: &str) -> Result<String, ErrBox> {
   match get_asset(name) {
     Some(a) => Ok(a),
     None => Err(
@@ -252,19 +252,26 @@ pub fn get_asset2(name: &str) -> Result<&'static str, ErrBox> {
   }
 }
 
-pub fn get_asset(name: &str) -> Option<&'static str> {
-  macro_rules! inc {
-    ($e:expr) => {
-      Some(include_str!(concat!("typescript/lib/", $e)))
-    };
-  }
+fn read_file(name: &str) -> String {
+  fs::read_to_string(name).unwrap()
+}
+
+macro_rules! inc {
+  ($e:expr) => {
+    Some(read_file(concat!("../deno_typescript/typescript/lib/", $e)))
+  };
+}
+
+pub fn get_asset(name: &str) -> Option<String> {
   match name {
-    "bundle_loader.js" => Some(include_str!("bundle_loader.js")),
-    "lib.deno_core.d.ts" => Some(include_str!("lib.deno_core.d.ts")),
-    "lib.deno_runtime.d.ts" => {
-      Some(include_str!("../cli/js/lib.deno_runtime.d.ts"))
+    "bundle_loader.js" => {
+      Some(read_file("../deno_typescript/bundle_loader.js"))
     }
-    "bootstrap.ts" => Some("console.log(\"hello deno\");"),
+    "lib.deno_core.d.ts" => {
+      Some(read_file("../deno_typescript/lib.deno_core.d.ts"))
+    }
+    "lib.deno_runtime.d.ts" => Some(read_file("js/lib.deno_runtime.d.ts")),
+    "bootstrap.ts" => Some("console.log(\"hello deno\");".to_string()),
     "typescript.d.ts" => inc!("typescript.d.ts"),
     "lib.esnext.d.ts" => inc!("lib.esnext.d.ts"),
     "lib.es2020.d.ts" => inc!("lib.es2020.d.ts"),
diff --git a/deno_typescript/ops.rs b/deno_typescript/ops.rs
index d557b9b8c0..c64b709b6d 100644
--- a/deno_typescript/ops.rs
+++ b/deno_typescript/ops.rs
@@ -45,7 +45,7 @@ pub fn read_file(_s: &mut TSState, v: Value) -> Result<Value, ErrBox> {
   let v: ReadFile = serde_json::from_value(v)?;
   let (module_name, source_code) = if v.file_name.starts_with("$asset$/") {
     let asset = v.file_name.replace("$asset$/", "");
-    let source_code = crate::get_asset2(&asset)?.to_string();
+    let source_code = crate::get_asset2(&asset)?;
     (asset, source_code)
   } else {
     assert!(!v.file_name.starts_with("$assets$"), "you meant $asset$");