fix: update deps (#1137)

Author: crowlKats

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "registry_api"
 version = "1.1.0"
-edition = "2021"
+edition = "2024"
 resolver = "2"
 
 [dependencies]
@@ -74,14 +74,14 @@ opentelemetry = { version = "0.19", features = [
 ] }
 opentelemetry-otlp = "0.12"
 opentelemetry-gcloud-trace = "0.5.0"
-deno_semver = "0.7.1"
+deno_semver = "0.8.0"
 flate2 = "1"
 thiserror = "2"
 async-tar = "0.4.2"
-deno_graph = "0.89.4"
-deno_ast = { version = "0.46.5", features = ["view"] }
-deno_doc = { version = "0.171.1", features = ["comrak"] }
-deno_error = "0.5.5"
+deno_graph = "0.95.1"
+deno_ast = { version = "0.48.0", features = ["view"] }
+deno_doc = { version = "=0.178.1", features = ["comrak"] }
+deno_error = "0.6.1"
 comrak = { version = "0.29.0", default-features = false }
 ammonia = "4.0.0"
 async-trait = "0.1.73"
@@ -93,12 +93,10 @@ regex = "1.10.2"
 postmark = { version = "=0.10.0", features = ["reqwest-rustls-tls"] }
 handlebars = "5.0.0"
 jsonc-parser = { version = "0.23", features = ["serde"] }
-deno_npm = "0.27.2"
 sha1 = "0.10.6"
 infer = "0.15.0"
 x509-parser = { version = "0.15.1", features = ["verify"] }
 sitemap-rs = "0.2.1"
-html-escape = "0.2.13"
 
 tree-sitter-highlight = "0.22.6"
 tree-sitter-javascript = "0.21.4"
@@ -115,5 +113,5 @@ lazy_static = "1.5.0"
 
 [dev-dependencies]
 flate2 = "1"
-deno_semver = "0.7.1"
+deno_semver = "0.8.0"
 pretty_assertions = "1.4.0"

api/Cargo.toml

@@ -5,42 +5,42 @@ use std::collections::HashSet;
 use std::sync::Arc;
 
 use bytes::Bytes;
-use deno_ast::swc::common::comments::CommentKind;
-use deno_ast::swc::common::Span;
 use deno_ast::LineAndColumnDisplay;
 use deno_ast::MediaType;
 use deno_ast::ModuleSpecifier;
 use deno_ast::ParsedSource;
 use deno_ast::SourceRange;
 use deno_ast::SourceRangedForSpanned;
+use deno_ast::swc::common::Span;
+use deno_ast::swc::common::comments::CommentKind;
 use deno_doc::DocNodeDef;
 use deno_error::JsErrorBox;
-use deno_graph::source::load_data_url;
-use deno_graph::source::JsrUrlProvider;
-use deno_graph::source::LoadError;
-use deno_graph::source::LoadOptions;
-use deno_graph::source::NullFileSystem;
 use deno_graph::BuildFastCheckTypeGraphOptions;
 use deno_graph::BuildOptions;
-use deno_graph::CapturingModuleAnalyzer;
-use deno_graph::DefaultEsParser;
 use deno_graph::GraphKind;
 use deno_graph::ModuleGraph;
-use deno_graph::ModuleInfo;
-use deno_graph::ParsedSourceStore;
 use deno_graph::WorkspaceFastCheckOption;
 use deno_graph::WorkspaceMember;
+use deno_graph::analysis::ModuleInfo;
+use deno_graph::ast::CapturingModuleAnalyzer;
+use deno_graph::ast::DefaultEsParser;
+use deno_graph::ast::ParsedSourceStore;
+use deno_graph::source::JsrUrlProvider;
+use deno_graph::source::LoadError;
+use deno_graph::source::LoadOptions;
+use deno_graph::source::NullFileSystem;
+use deno_graph::source::load_data_url;
+use deno_semver::StackString;
 use deno_semver::jsr::JsrPackageReqReference;
 use deno_semver::npm::NpmPackageReqReference;
 use deno_semver::package::PackageNv;
 use deno_semver::package::PackageReqReference;
-use deno_semver::StackString;
 use futures::FutureExt;
 use once_cell::sync::Lazy;
-use regex::bytes::Regex as BytesRegex;
 use regex::Regex;
-use tracing::instrument;
+use regex::bytes::Regex as BytesRegex;
 use tracing::Instrument;
+use tracing::instrument;
 use url::Url;
 
 use crate::buckets::BucketWithQueue;
@@ -53,10 +53,10 @@ use crate::ids::PackageName;
 use crate::ids::PackagePath;
 use crate::ids::ScopeName;
 use crate::ids::Version;
-use crate::npm::create_npm_tarball;
 use crate::npm::NpmTarball;
 use crate::npm::NpmTarballFiles;
 use crate::npm::NpmTarballOptions;
+use crate::npm::create_npm_tarball;
 use crate::tarball::PublishError;
 
 pub struct PackageAnalysisData {
@@ -141,15 +141,15 @@ async fn analyze_package_inner(
     exports: exports.clone().into_inner(),
   };
   let workspace_members = vec![workspace_member.clone()];
-  let mut graph = deno_graph::ModuleGraph::new(GraphKind::All);
+  let mut graph = ModuleGraph::new(GraphKind::All);
   graph
     .build(
       roots.clone(),
+      vec![],
       &SyncLoader { files: &files },
       BuildOptions {
         is_dynamic: false,
         module_analyzer: &module_analyzer,
-        imports: Default::default(),
         // todo: use the data in the package for the file system
         file_system: &NullFileSystem,
         jsr_url_provider: &PassthroughJsrUrlProvider,
@@ -162,6 +162,7 @@ async fn analyze_package_inner(
         executor: Default::default(),
         locker: None,
         skip_dynamic_deps: false,
+        module_info_cacher: Default::default(),
       },
     )
     .await;
@@ -174,7 +175,6 @@ async fn analyze_package_inner(
     jsr_url_provider: &PassthroughJsrUrlProvider,
     es_parser: Some(&module_analyzer.analyzer),
     resolver: Default::default(),
-    npm_resolver: Default::default(),
     workspace_fast_check: WorkspaceFastCheckOption::Enabled(&workspace_members),
   });
 
@@ -473,6 +473,7 @@ impl SyncLoader<'_> {
         };
         Ok(Some(deno_graph::source::LoadResponse::Module {
           content: bytes.into(),
+          mtime: None,
           specifier: specifier.clone(),
           maybe_headers: None,
         }))
@@ -569,6 +570,7 @@ async fn rebuild_npm_tarball_inner(
   graph
     .build(
       roots.clone(),
+      vec![],
       &GcsLoader {
         files: &files,
         bucket: &modules_bucket,
@@ -579,7 +581,6 @@ async fn rebuild_npm_tarball_inner(
       BuildOptions {
         is_dynamic: false,
         module_analyzer: &module_analyzer,
-        imports: Default::default(),
         // todo: use the data in the package for the file system
         file_system: &NullFileSystem,
         jsr_url_provider: &PassthroughJsrUrlProvider,
@@ -592,6 +593,7 @@ async fn rebuild_npm_tarball_inner(
         executor: Default::default(),
         locker: None,
         skip_dynamic_deps: false,
+        module_info_cacher: Default::default(),
       },
     )
     .await;
@@ -602,7 +604,6 @@ async fn rebuild_npm_tarball_inner(
     jsr_url_provider: &PassthroughJsrUrlProvider,
     es_parser: Some(&module_analyzer.analyzer),
     resolver: None,
-    npm_resolver: None,
     workspace_fast_check: WorkspaceFastCheckOption::Enabled(&workspace_members),
   });
 
@@ -660,6 +661,7 @@ impl GcsLoader<'_> {
           };
           Ok(Some(deno_graph::source::LoadResponse::Module {
             content: bytes.to_vec().into(),
+            mtime: None,
             specifier,
             maybe_headers: None,
           }))
@@ -695,10 +697,10 @@ impl deno_graph::source::Loader for GcsLoader<'_> {
 #[derive(Default)]
 pub struct ModuleParser(DefaultEsParser);
 
-impl deno_graph::EsParser for ModuleParser {
+impl deno_graph::ast::EsParser for ModuleParser {
   fn parse_program(
     &self,
-    options: deno_graph::ParseOptions,
+    options: deno_graph::ast::ParseOptions,
   ) -> Result<ParsedSource, deno_ast::ParseDiagnostic> {
     let source = self.0.parse_program(options)?;
     if let Some(err) = source.diagnostics().first() {
@@ -742,13 +744,13 @@ impl ModuleAnalyzer {
 }
 
 #[async_trait::async_trait(?Send)]
-impl deno_graph::ModuleAnalyzer for ModuleAnalyzer {
+impl deno_graph::analysis::ModuleAnalyzer for ModuleAnalyzer {
   async fn analyze(
     &self,
     specifier: &ModuleSpecifier,
     source: Arc<str>,
     media_type: MediaType,
-  ) -> Result<ModuleInfo, deno_ast::ParseDiagnostic> {
+  ) -> Result<ModuleInfo, JsErrorBox> {
     let module_info =
       self.analyzer.analyze(specifier, source, media_type).await?;
     self

api/src/analysis.rs

@@ -1,34 +1,34 @@
 // Copyright 2024 the JSR authors. All rights reserved. MIT license.
-use crate::buckets::Buckets;
-use crate::orama::OramaClient;
 use crate::NpmUrl;
 use crate::RegistryUrl;
+use crate::buckets::Buckets;
+use crate::orama::OramaClient;
 use hyper::Body;
 use hyper::Request;
-use routerify::prelude::RequestExt;
 use routerify::Router;
+use routerify::prelude::RequestExt;
 use routerify_query::RequestQueryExt;
-use tracing::field;
-use tracing::instrument;
 use tracing::Instrument;
 use tracing::Span;
+use tracing::field;
+use tracing::instrument;
 
 use crate::db::*;
 use crate::iam::ReqIamExt;
 use crate::ids::ScopeDescription;
 use crate::publish::publish_task;
 use crate::util;
+use crate::util::ApiResult;
+use crate::util::RequestIdExt;
 use crate::util::decode_json;
 use crate::util::pagination;
 use crate::util::search;
 use crate::util::sort;
-use crate::util::ApiResult;
-use crate::util::RequestIdExt;
 
-use super::map_unique_violation;
-use super::types::*;
 use super::ApiError;
 use super::PublishQueue;
+use super::map_unique_violation;
+use super::types::*;
 
 pub fn admin_router() -> Router<Body, ApiError> {
   Router::builder()

api/src/api/admin.rs

@@ -5,20 +5,20 @@ use hyper::Body;
 use hyper::Request;
 use hyper::Response;
 use rand::Rng;
-use routerify::prelude::RequestExt;
 use routerify::Router;
+use routerify::prelude::RequestExt;
 use sha2::Digest;
 use url::Url;
 
+use crate::RegistryUrl;
 use crate::db::Database;
 use crate::db::NewAuthorization;
 use crate::db::TokenType;
 use crate::iam::ReqIamExt;
 use crate::token::create_token;
 use crate::util;
-use crate::util::decode_json;
 use crate::util::ApiResult;
-use crate::RegistryUrl;
+use crate::util::decode_json;
 
 use super::ApiAuthorization;
 use super::ApiAuthorizationExchangeRequest;