Merge branch 'main' into fix-ui-leave

Author: AugustinMauroy

.github/workflows/title.yml

@@ -0,0 +1,34 @@
+name: "Lint PR title"
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - edited
+      - synchronize
+
+permissions:
+  pull-requests: read
+
+jobs:
+  main:
+    name: Validate PR title
+    runs-on: ubuntu-latest
+    steps:
+      - uses: amannn/action-semantic-pull-request@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          types: |
+            BREAKING
+            deprecation
+            feat
+            fix
+            docs
+            refactor
+            perf
+            test
+            ci
+            chore
+            revert
+          requireScope: false

api/.sqlx/query-8433bacb42d0833b723781eff2467ab27542e94691c1a5626c3f3d8c090caa54.json

@@ -71,6 +71,7 @@ use crate::iam::ReqIamExt;
 use crate::ids::PackageName;
 use crate::ids::PackagePath;
 use crate::ids::ScopeName;
+use crate::ids::Version;
 use crate::metadata::PackageMetadata;
 use crate::metadata::VersionMetadata;
 use crate::npm::generate_npm_version_manifest;
@@ -333,12 +334,30 @@ pub async fn get_handler(req: Request<Body>) -> ApiResult<ApiPackage> {
   Span::current().record("package", field::display(&package));
 
   let db = req.data::<Database>().unwrap();
-  let package = db
+  let res_package = db
     .get_package(&scope, &package)
     .await?
     .ok_or(ApiError::PackageNotFound)?;
 
-  Ok(ApiPackage::from(package))
+  let mut api_package = ApiPackage::from(res_package);
+
+  if let Some(latest_v) = &api_package.latest_version {
+    let latest_version = Version::new(latest_v).unwrap();
+    let dependency_count = db
+      .count_package_dependencies(&scope, &package, &latest_version)
+      .await?;
+    api_package.dependency_count = dependency_count as u64;
+  }
+
+  let dependent_count = db
+    .count_package_dependents(
+      crate::db::DependencyKind::Jsr,
+      &format!("@{}/{}", scope, package),
+    )
+    .await?;
+  api_package.dependent_count = dependent_count as u64;
+
+  Ok(api_package)
 }
 
 #[instrument(

api/src/api/package.rs

@@ -470,6 +470,8 @@ pub struct ApiPackage {
   pub updated_at: DateTime<Utc>,
   pub created_at: DateTime<Utc>,
   pub version_count: u64,
+  pub dependency_count: u64,
+  pub dependent_count: u64,
   pub score: Option<u32>,
   pub latest_version: Option<String>,
   pub when_featured: Option<DateTime<Utc>>,
@@ -491,6 +493,8 @@ impl From<PackageWithGitHubRepoAndMeta> for ApiPackage {
       updated_at: package.updated_at,
       created_at: package.created_at,
       version_count: package.version_count as u64,
+      dependency_count: 0,
+      dependent_count: 0,
       score: package
         .latest_version
         .as_ref()

api/src/api/types.rs

@@ -2858,6 +2858,48 @@ impl Database {
     Ok((total_unique_package_dependents as usize, dependents))
   }
 
+  #[instrument(name = "Database::count_package_dependents", skip(self), err)]
+  pub async fn count_package_dependents(
+    &self,
+    kind: DependencyKind,
+    name: &str,
+  ) -> Result<usize> {
+    let total_unique_package_dependents = sqlx::query!(
+      r#"SELECT COUNT(DISTINCT (package_scope, package_name)) FROM package_version_dependencies
+      WHERE dependency_kind = $1 AND dependency_name = $2;"#,
+      kind as _,
+      name,
+    )
+    .map(|r| r.count.unwrap())
+    .fetch_one(&self.pool)
+    .await?;
+
+    Ok(total_unique_package_dependents as usize)
+  }
+
+  #[instrument(name = "Database::count_package_dependencies", skip(self), err)]
+  pub async fn count_package_dependencies(
+    &self,
+    scope: &ScopeName,
+    name: &PackageName,
+    version: &Version,
+  ) -> Result<usize> {
+    let total_package_dependencies = sqlx::query!(
+      r#"SELECT COUNT(DISTINCT dependency_name)
+      FROM package_version_dependencies
+      WHERE package_scope = $1 AND package_name = $2 AND package_version = $3"#,
+      scope as _,
+      name as _,
+      version as _
+    )
+    .fetch_one(&self.pool)
+    .await?
+    .count
+    .unwrap();
+
+    Ok(total_package_dependencies as usize)
+  }
+
   #[instrument(name = "Database::check_bad_word", skip(self), err)]
   pub async fn check_is_bad_word(&self, word: &str) -> Result<bool> {
     let res = sqlx::query!("SELECT * FROM bad_words WHERE word = $1", word)

api/src/db/database.rs

@@ -107,7 +107,7 @@ export function Header({
               ? <UserMenu user={user} sudo={sudo} logoutUrl={logoutUrl} />
               : (
                 <a href={loginUrl} class="link-header flex items-center gap-2">
-                  <TbBrandGithub class="size-5 flex-none" aria-hidden={true} />
+                  <TbBrandGithub class="size-5 flex-none" aria-hidden />
                   Sign in
                 </a>
               )}

frontend/components/Header.tsx

@@ -71,7 +71,7 @@ export function HomepageHero(
           <GlobalSearch
             apiKey={apiKey}
             indexId={indexId}
-            jumbo={true}
+            jumbo
           />
         </div>
         <div class="flex flex-col items-center gap-4">

frontend/components/HomepageHero.tsx

@@ -26,6 +26,7 @@ export function Markdown(
   return (
     <div
       class="markdown-body"
+      // deno-lint-ignore react-no-danger
       dangerouslySetInnerHTML={{ __html: html }}
     />
   );

frontend/components/Markdown.tsx

@@ -34,6 +34,7 @@ export default function Modal(
           onClick={(e) => e.stopPropagation()}
         >
           <button
+            type="button"
             class="absolute top-8 right-8 hover:text-jsr-gray-400"
             onClick={() => setOpen(false)}
           >

frontend/components/Modal.tsx

@@ -15,13 +15,15 @@ export function Nav(props: NavProps) {
       } border-b border-jsr-cyan-300/30 max-w-full flex justify-between overflow-x-auto items-end`}
     >
       <style
+        // deno-lint-ignore react-no-danger
         dangerouslySetInnerHTML={{
           __html:
             "nav:has(#nav-items[data-unattached]) { visibility: hidden; }",
         }}
       />
       <noscript>
         <style
+          // deno-lint-ignore react-no-danger
           dangerouslySetInnerHTML={{
             __html:
               "nav:has(#nav-items[data-unattached]) { visibility: visible !important }",
@@ -49,7 +51,7 @@ export interface NavItemProps {
 export function NavItem(props: NavItemProps) {
   return (
     <a
-      class={`md:px-3 px-4 py-2 text-sm md:text-base min-h-10 leading-none rounded-md hover:bg-jsr-cyan-100 flex items-center select-none focus:outline-none focus:border-1 focus:border-jsr-cyan-300 focus:ring-1 focus:ring-jsr-cyan-300 focus:ring-opacity-50 ${
+      class={`md:px-3 px-4 py-2 text-sm md:text-base min-h-10 leading-none rounded-md hover:bg-jsr-cyan-100 flex items-center select-none focus:outline-none focus-visible:outline-1 focus-visible:outline-jsr-cyan-300 focus-visible:outline-offset-0 focus-visible:ring-0 ${
         props.active
           ? "bg-jsr-cyan-50 border-1 border-jsr-cyan-300/30 font-semibold"
           : ""