foster/deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-03 17:34:47 -05:00
Code Issues Packages 1 Wiki Activity

js_errors: rename source_url to script_name (#1329)

Browse source
This commit is contained in:
ggtmtmgg 2018-12-13 01:44:13 +09:00 • committed by Ryan Dahl
parent e976b3e041
commit 6b8daf9f3f
1 changed files with 29 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/js_errors.rs
View file

@ -33,7 +33,7 @@ type CachedMaps = HashMap<String, Option<SourceMap>>;
pub struct StackFrame { pub struct StackFrame {
pub line: u32, // zero indexed pub line: u32, // zero indexed
pub column: u32, // zero indexed pub column: u32, // zero indexed
pub source_url: String, // TODO rename to 'script_name' pub script_name: String,
pub function_name: String, pub function_name: String,
pub is_eval: bool, pub is_eval: bool,
pub is_constructor: bool, pub is_constructor: bool,
@ -53,12 +53,12 @@ impl ToString for StackFrame {
if self.function_name.len() > 0 { if self.function_name.len() > 0 {
format!( format!(
" at {} ({}:{}:{})", " at {} ({}:{}:{})",
self.function_name, self.source_url, line, column self.function_name, self.script_name, line, column
) )
} else if self.is_eval { } else if self.is_eval {
format!(" at eval ({}:{}:{})", self.source_url, line, column) format!(" at eval ({}:{}:{})", self.script_name, line, column)
} else { } else {
format!(" at {}:{}:{}", self.source_url, line, column) format!(" at {}:{}:{}", self.script_name, line, column)
} }
} }
} }
@ -138,7 +138,7 @@ impl StackFrame {
Some(StackFrame { Some(StackFrame {
line: line - 1, line: line - 1,
column: column - 1, column: column - 1,
source_url: script_name, script_name: script_name,
function_name, function_name,
is_eval, is_eval,
is_constructor, is_constructor,
@ -151,9 +151,10 @@ impl StackFrame {
mappings_map: &mut CachedMaps, mappings_map: &mut CachedMaps,
getter: &SourceMapGetter, getter: &SourceMapGetter,
) -> StackFrame { ) -> StackFrame {
let maybe_sm = get_mappings(self.source_url.as_ref(), mappings_map, getter); let maybe_sm =
let frame_pos = (self.source_url.to_owned(), self.line, self.column); get_mappings(self.script_name.as_ref(), mappings_map, getter);
let (source_url, line, column) = match maybe_sm { let frame_pos = (self.script_name.to_owned(), self.line, self.column);
let (script_name, line, column) = match maybe_sm {
None => frame_pos, None => frame_pos,
Some(sm) => match sm.mappings.original_location_for( Some(sm) => match sm.mappings.original_location_for(
self.line, self.line,
@ -176,7 +177,7 @@ impl StackFrame {
}; };
StackFrame { StackFrame {
source_url, script_name,
function_name: self.function_name.clone(), function_name: self.function_name.clone(),
line, line,
column, column,
@ -272,16 +273,16 @@ impl JSError {
} }
fn parse_map_string( fn parse_map_string(
source_url: &str, script_name: &str,
getter: &SourceMapGetter, getter: &SourceMapGetter,
) -> Option<SourceMap> { ) -> Option<SourceMap> {
match source_url { match script_name {
"gen/bundle/main.js" => { "gen/bundle/main.js" => {
let s = let s =
include_str!(concat!(env!("GN_OUT_DIR"), "/gen/bundle/main.js.map")); include_str!(concat!(env!("GN_OUT_DIR"), "/gen/bundle/main.js.map"));
SourceMap::from_json(s) SourceMap::from_json(s)
} }
_ => match getter.get_source_map(source_url) { _ => match getter.get_source_map(script_name) {
None => None, None => None,
Some(raw_source_map) => SourceMap::from_json( Some(raw_source_map) => SourceMap::from_json(
&String::from_utf8(raw_source_map).expect("SourceMap is not utf-8"), &String::from_utf8(raw_source_map).expect("SourceMap is not utf-8"),
@ -291,13 +292,13 @@ fn parse_map_string(
} }
fn get_mappings<'a>( fn get_mappings<'a>(
source_url: &str, script_name: &str,
mappings_map: &'a mut CachedMaps, mappings_map: &'a mut CachedMaps,
getter: &SourceMapGetter, getter: &SourceMapGetter,
) -> &'a Option<SourceMap> { ) -> &'a Option<SourceMap> {
mappings_map mappings_map
.entry(source_url.to_string()) .entry(script_name.to_string())
.or_insert_with(|| parse_map_string(source_url, getter)) .or_insert_with(|| parse_map_string(script_name, getter))
} }
#[cfg(test)] #[cfg(test)]
@ -311,7 +312,7 @@ mod tests {
StackFrame { StackFrame {
line: 4, line: 4,
column: 16, column: 16,
source_url: "foo_bar.ts".to_string(), script_name: "foo_bar.ts".to_string(),
function_name: "foo".to_string(), function_name: "foo".to_string(),
is_eval: false, is_eval: false,
is_constructor: false, is_constructor: false,
@ -320,7 +321,7 @@ mod tests {
StackFrame { StackFrame {
line: 5, line: 5,
column: 20, column: 20,
source_url: "bar_baz.ts".to_string(), script_name: "bar_baz.ts".to_string(),
function_name: "qat".to_string(), function_name: "qat".to_string(),
is_eval: false, is_eval: false,
is_constructor: false, is_constructor: false,
@ -329,7 +330,7 @@ mod tests {
StackFrame { StackFrame {
line: 1, line: 1,
column: 1, column: 1,
source_url: "deno_main.js".to_string(), script_name: "deno_main.js".to_string(),
function_name: "".to_string(), function_name: "".to_string(),
is_eval: false, is_eval: false,
is_constructor: false, is_constructor: false,
@ -371,7 +372,7 @@ mod tests {
Some(StackFrame { Some(StackFrame {
line: 1, line: 1,
column: 10, column: 10,
source_url: "/Users/rld/src/deno/tests/error_001.ts".to_string(), script_name: "/Users/rld/src/deno/tests/error_001.ts".to_string(),
function_name: "foo".to_string(), function_name: "foo".to_string(),
is_eval: true, is_eval: true,
is_constructor: false, is_constructor: false,
@ -394,7 +395,7 @@ mod tests {
let f = r.unwrap(); let f = r.unwrap();
assert_eq!(f.line, 1); assert_eq!(f.line, 1);
assert_eq!(f.column, 10); assert_eq!(f.column, 10);
assert_eq!(f.source_url, "/Users/rld/src/deno/tests/error_001.ts"); assert_eq!(f.script_name, "/Users/rld/src/deno/tests/error_001.ts");
} }
#[test] #[test]
@ -431,7 +432,7 @@ mod tests {
StackFrame { StackFrame {
line: 1, line: 1,
column: 10, column: 10,
source_url: "/Users/rld/src/deno/tests/error_001.ts".to_string(), script_name: "/Users/rld/src/deno/tests/error_001.ts".to_string(),
function_name: "foo".to_string(), function_name: "foo".to_string(),
is_eval: true, is_eval: true,
is_constructor: false, is_constructor: false,
@ -464,7 +465,7 @@ mod tests {
StackFrame { StackFrame {
line: 5, line: 5,
column: 12, column: 12,
source_url: "foo_bar.ts".to_string(), script_name: "foo_bar.ts".to_string(),
function_name: "foo".to_string(), function_name: "foo".to_string(),
is_eval: false, is_eval: false,
is_constructor: false, is_constructor: false,
@ -473,7 +474,7 @@ mod tests {
StackFrame { StackFrame {
line: 4, line: 4,
column: 14, column: 14,
source_url: "bar_baz.ts".to_string(), script_name: "bar_baz.ts".to_string(),
function_name: "qat".to_string(), function_name: "qat".to_string(),
is_eval: false, is_eval: false,
is_constructor: false, is_constructor: false,
@ -482,7 +483,7 @@ mod tests {
StackFrame { StackFrame {
line: 1, line: 1,
column: 1, column: 1,
source_url: "deno_main.js".to_string(), script_name: "deno_main.js".to_string(),
function_name: "".to_string(), function_name: "".to_string(),
is_eval: false, is_eval: false,
is_constructor: false, is_constructor: false,
@ -501,7 +502,7 @@ mod tests {
frames: vec![StackFrame { frames: vec![StackFrame {
line: 11, line: 11,
column: 12, column: 12,
source_url: "gen/bundle/main.js".to_string(), script_name: "gen/bundle/main.js".to_string(),
function_name: "setLogDebug".to_string(), function_name: "setLogDebug".to_string(),
is_eval: false, is_eval: false,
is_constructor: false, is_constructor: false,
@ -514,7 +515,7 @@ mod tests {
assert_eq!(actual.frames.len(), 1); assert_eq!(actual.frames.len(), 1);
assert_eq!(actual.frames[0].line, 15); assert_eq!(actual.frames[0].line, 15);
assert_eq!(actual.frames[0].column, 16); assert_eq!(actual.frames[0].column, 16);
assert_eq!(actual.frames[0].source_url, "deno/js/util.ts"); assert_eq!(actual.frames[0].script_name, "deno/js/util.ts");
} }
#[test] #[test]