diff options
Diffstat (limited to 'cli/module_loader.rs')
-rw-r--r-- | cli/module_loader.rs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cli/module_loader.rs b/cli/module_loader.rs index 6fbeb8770..9deb13b7d 100644 --- a/cli/module_loader.rs +++ b/cli/module_loader.rs @@ -35,7 +35,7 @@ use deno_core::futures::Future; use deno_core::parking_lot::Mutex; use deno_core::resolve_url; use deno_core::resolve_url_or_path; -use deno_core::ModuleCode; +use deno_core::ModuleCodeString; use deno_core::ModuleLoader; use deno_core::ModuleSource; use deno_core::ModuleSourceCode; @@ -264,8 +264,8 @@ impl ModuleLoadPreparer { } } -pub struct ModuleCodeSource { - pub code: ModuleCode, +pub struct ModuleCodeStringSource { + pub code: ModuleCodeString, pub found_url: ModuleSpecifier, pub media_type: MediaType, } @@ -281,7 +281,7 @@ impl PreparedModuleLoader { &self, specifier: &ModuleSpecifier, maybe_referrer: Option<&ModuleSpecifier>, - ) -> Result<ModuleCodeSource, AnyError> { + ) -> Result<ModuleCodeStringSource, AnyError> { if specifier.scheme() == "node" { unreachable!(); // Node built-in modules should be handled internally. } @@ -293,7 +293,7 @@ impl PreparedModuleLoader { media_type, specifier, .. - })) => Ok(ModuleCodeSource { + })) => Ok(ModuleCodeStringSource { code: source.clone().into(), found_url: specifier.clone(), media_type: *media_type, @@ -304,7 +304,7 @@ impl PreparedModuleLoader { specifier, .. })) => { - let code: ModuleCode = match media_type { + let code: ModuleCodeString = match media_type { MediaType::JavaScript | MediaType::Unknown | MediaType::Cjs @@ -331,7 +331,7 @@ impl PreparedModuleLoader { // at this point, we no longer need the parsed source in memory, so free it self.parsed_source_cache.free(specifier); - Ok(ModuleCodeSource { + Ok(ModuleCodeStringSource { code, found_url: specifier.clone(), media_type: *media_type, @@ -862,7 +862,7 @@ impl NpmModuleLoader { specifier: &ModuleSpecifier, maybe_referrer: Option<&ModuleSpecifier>, permissions: &PermissionsContainer, - ) -> Option<Result<ModuleCodeSource, AnyError>> { + ) -> Option<Result<ModuleCodeStringSource, AnyError>> { if self.node_resolver.in_npm_package(specifier) { Some(self.load_sync(specifier, maybe_referrer, permissions)) } else { @@ -875,7 +875,7 @@ impl NpmModuleLoader { specifier: &ModuleSpecifier, maybe_referrer: Option<&ModuleSpecifier>, permissions: &PermissionsContainer, - ) -> Result<ModuleCodeSource, AnyError> { + ) -> Result<ModuleCodeStringSource, AnyError> { let file_path = specifier.to_file_path().unwrap(); let code = self .fs @@ -923,7 +923,7 @@ impl NpmModuleLoader { // esm and json code is untouched code }; - Ok(ModuleCodeSource { + Ok(ModuleCodeStringSource { code: code.into(), found_url: specifier.clone(), media_type: MediaType::from_specifier(specifier), |