summaryrefslogtreecommitdiff
path: root/deno_typescript
diff options
context:
space:
mode:
Diffstat (limited to 'deno_typescript')
-rw-r--r--deno_typescript/lib.rs27
-rw-r--r--deno_typescript/ops.rs2
2 files changed, 12 insertions, 17 deletions
diff --git a/deno_typescript/lib.rs b/deno_typescript/lib.rs
index 370079fa1..c503d3508 100644
--- a/deno_typescript/lib.rs
+++ b/deno_typescript/lib.rs
@@ -241,7 +241,7 @@ fn write_snapshot(
}
/// Same as get_asset() but returns NotFound intead of None.
-pub fn get_asset2(name: &str) -> Result<String, ErrBox> {
+pub fn get_asset2(name: &str) -> Result<&'static str, ErrBox> {
match get_asset(name) {
Some(a) => Ok(a),
None => Err(
@@ -251,23 +251,18 @@ pub fn get_asset2(name: &str) -> Result<String, ErrBox> {
}
}
-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> {
+pub fn get_asset(name: &str) -> Option<&'static str> {
+ macro_rules! inc {
+ ($e:expr) => {
+ Some(include_str!(concat!("typescript/lib/", $e)))
+ };
+ }
match name {
- "bundle_loader.js" => {
- Some(read_file("../deno_typescript/bundle_loader.js"))
+ "bundle_loader.js" => Some(include_str!("bundle_loader.js")),
+ "lib.deno_runtime.d.ts" => {
+ Some(include_str!("../cli/js/lib.deno_runtime.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()),
+ "bootstrap.ts" => Some("console.log(\"hello deno\");"),
"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 c64b709b6..d557b9b8c 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)?;
+ let source_code = crate::get_asset2(&asset)?.to_string();
(asset, source_code)
} else {
assert!(!v.file_name.starts_with("$assets$"), "you meant $asset$");