Skip to content

Commit

Permalink
refactor: load bytes in deno_graph (denoland#22212)
Browse files Browse the repository at this point in the history
Upgrades deno_graph to 0.64 where deno_graph is now responsible for
turning bytes into a string. This is in preparation for Wasm modules.
  • Loading branch information
dsherret committed Feb 1, 2024
1 parent 830d096 commit 4b7c604
Show file tree
Hide file tree
Showing 38 changed files with 325 additions and 637 deletions.
19 changes: 9 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 4 additions & 6 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,16 @@ deno_ast = { workspace = true, features = ["bundler", "cjs", "codegen", "dep_gra
deno_cache_dir = "=0.6.1"
deno_config = "=0.9.1"
deno_core = { workspace = true, features = ["include_js_files_for_snapshotting"] }
deno_doc = { version = "=0.98.0", features = ["html"] }
deno_emit = "=0.34.0"
deno_graph = "=0.63.6"
deno_doc = { version = "=0.100.0", features = ["html"] }
deno_emit = "=0.35.0"
deno_graph = "=0.64.1"
deno_lint = { version = "=0.55.0", features = ["docs"] }
deno_lockfile.workspace = true
deno_npm = "=0.16.0"
deno_runtime = { workspace = true, features = ["include_js_files_for_snapshotting"] }
deno_semver = "=0.5.4"
deno_task_shell = "=0.14.3"
eszip = "=0.59.0"
eszip = "=0.60.0"
napi_sym.workspace = true

async-trait.workspace = true
Expand All @@ -83,14 +83,12 @@ color-print = "0.3.5"
console_static_text.workspace = true
dashmap = "5.5.3"
data-encoding.workspace = true
data-url.workspace = true
dissimilar = "=1.0.4"
dotenvy = "0.15.7"
dprint-plugin-json = "=0.19.1"
dprint-plugin-jupyter = "=0.1.2"
dprint-plugin-markdown = "=0.16.3"
dprint-plugin-typescript = "=0.88.10"
encoding_rs.workspace = true
env_logger = "=0.10.0"
fancy-regex = "=0.10.0"
# If you disable the default __vendored_zlib_ng feature above, you _must_ be able to link against `-lz`.
Expand Down
8 changes: 5 additions & 3 deletions cli/args/import_map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ use import_map::ImportMapDiagnostic;
use log::warn;

use super::ConfigFile;
use crate::file_fetcher::get_source_from_data_url;
use crate::file_fetcher::FileFetcher;

pub async fn resolve_import_map_from_specifier(
Expand All @@ -18,7 +17,9 @@ pub async fn resolve_import_map_from_specifier(
file_fetcher: &FileFetcher,
) -> Result<ImportMap, AnyError> {
let value: serde_json::Value = if specifier.scheme() == "data" {
serde_json::from_str(&get_source_from_data_url(specifier)?.0)?
let data_url_text =
deno_graph::source::RawDataUrl::parse(specifier)?.decode()?;
serde_json::from_str(&data_url_text)?
} else {
let import_map_config = maybe_config_file
.as_ref()
Expand All @@ -28,7 +29,8 @@ pub async fn resolve_import_map_from_specifier(
None => {
let file = file_fetcher
.fetch(specifier, PermissionsContainer::allow_all())
.await?;
.await?
.into_text_decoded()?;
serde_json::from_str(&file.source)?
}
}
Expand Down
4 changes: 2 additions & 2 deletions cli/cache/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -279,10 +279,10 @@ impl Loader for FetchCacher {
fn cache_module_info(
&mut self,
specifier: &ModuleSpecifier,
source: &str,
source: &Arc<[u8]>,
module_info: &deno_graph::ModuleInfo,
) {
let source_hash = ModuleInfoCacheSourceHash::from_source(source.as_bytes());
let source_hash = ModuleInfoCacheSourceHash::from_source(source);
let result = self.module_info_cache.set_module_info(
specifier,
MediaType::from_specifier(specifier),
Expand Down
4 changes: 2 additions & 2 deletions cli/cache/parsed_source.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ pub struct ParsedSourceCache {
}

impl ParsedSourceCache {
pub fn get_parsed_source_from_esm_module(
pub fn get_parsed_source_from_js_module(
&self,
module: &deno_graph::EsmModule,
module: &deno_graph::JsModule,
) -> Result<ParsedSource, deno_ast::Diagnostic> {
self.get_or_parse_module(
&module.specifier,
Expand Down
2 changes: 1 addition & 1 deletion cli/emit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ impl Emitter {
graph: &ModuleGraph,
) -> Result<(), AnyError> {
for module in graph.modules() {
if let Module::Esm(module) = module {
if let Module::Js(module) = module {
let is_emittable = matches!(
module.media_type,
MediaType::TypeScript
Expand Down

0 comments on commit 4b7c604

Please sign in to comment.