Merge branch 'main' into johnd/style-updates-2

jsr-io · May 20, 2024 · 8398113 · 8398113
2 parents c97c50c + a8e7cd6
commit 8398113
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 35 deletions.
diff --git a/api/src/api/package.rs b/api/src/api/package.rs
@@ -549,7 +549,7 @@ pub async fn delete_handler(req: Request<Body>) -> ApiResult<Response<Body>> {
 
   let orama_client = req.data::<Option<OramaClient>>().unwrap();
   if let Some(orama_client) = orama_client {
-    orama_client.delete_package(&scope, &package).await?;
+    orama_client.delete_package(&scope, &package);
   }
 
   let res = Response::builder()

diff --git a/api/src/orama.rs b/api/src/orama.rs
@@ -46,6 +46,9 @@ impl OramaClient {
 
   #[instrument(name = "OramaClient::upsert_package", skip(self))]
   pub fn upsert_package(&self, package: &Package, meta: &PackageVersionMeta) {
+    if package.version_count == 0 {
+      return;
+    }
     let id = format!("@{}/{}", package.scope, package.name);
     let score = package
       .latest_version
@@ -87,27 +90,31 @@ impl OramaClient {
     );
   }
 
-  #[instrument(name = "OramaClient::delete_package", skip(self), err)]
-  pub async fn delete_package(
-    &self,
-    scope: &ScopeName,
-    package: &PackageName,
-  ) -> Result<(), anyhow::Error> {
+  #[instrument(name = "OramaClient::delete_package", skip(self))]
+  pub fn delete_package(&self, scope: &ScopeName, package: &PackageName) {
     let id = format!("@{scope}/{package}");
-    let res = self
-      .request(
-        &format!("/webhooks/{}/notify", self.index_id),
-        serde_json::json!({ "remove": [id] }),
-      )
-      .await?;
-    let status = res.status();
-    if status.is_success() {
-      Ok(())
-    } else {
-      let response = res.text().await?;
-      Err(anyhow::anyhow!(
-        "failed to deploy changes (status {status}): {response}"
-      ))
-    }
+    let body = serde_json::json!({ "remove": [id] });
+    let span = Span::current();
+    let client = self.clone();
+    let path = format!("/webhooks/{}/notify", self.index_id);
+    tokio::spawn(
+      async move {
+        let res = match  client.request(&path, body).await {
+          Ok(res) => res,
+          Err(err) => {
+            error!("failed to OramaClient::delete_package: {err}");
+            return;
+          }
+        };
+        let status = res.status();
+        if !status.is_success() {
+          let response = res.text().await.unwrap_or_default();
+          error!(
+            "failed to OramaClient::delete_package for {id} (status {status}): {response}"
+          );
+        }
+      }
+      .instrument(span),
+    );
   }
 }
diff --git a/api/src/publish.rs b/api/src/publish.rs
@@ -1183,7 +1183,7 @@ pub mod tests {
     )
     .await;
     assert_eq!(task.status, PublishingTaskStatus::Failure, "{task:#?}");
-    assert_eq!(task.error.unwrap().code, "jsrMissingConstraint");
+    assert_eq!(task.error.unwrap().code, "missingConstraint");
   }
 
   #[tokio::test]

diff --git a/api/src/tarball.rs b/api/src/tarball.rs
@@ -667,8 +667,8 @@ impl PublishError {
       PublishError::NpmTarballError(_) => Some("npmTarballError"),
       PublishError::InvalidJsrSpecifier(_) => Some("invalidJsrSpecifier"),
       PublishError::InvalidNpmSpecifier(_) => Some("invalidNpmSpecifier"),
-      PublishError::JsrMissingConstraint(_) => Some("jsrMissingConstraint"),
-      PublishError::NpmMissingConstraint(_) => Some("npmMissingConstraint"),
+      PublishError::JsrMissingConstraint(_) => Some("missingConstraint"),
+      PublishError::NpmMissingConstraint(_) => Some("missingConstraint"),
       PublishError::InvalidJsrScopedPackageName(_, _) => {
         Some("invalidJsrScopedPackageName")
       }

diff --git a/frontend/docs/writing-docs.md b/frontend/docs/writing-docs.md
@@ -18,6 +18,9 @@ There are two important pieces to documentation:
   of the package - it acts as an overview or summary for all symbols in the
   module
 
+> Also see this blog post on
+> [how to write docs for your package](https://deno.com/blog/document-javascript-package).
+
 ## Symbol documentation
 
 To add documentation for a symbol, add a JSDoc comment above the symbol:

diff --git a/frontend/routes/package/(_islands)/BreadcrumbsSticky.tsx b/frontend/routes/package/(_islands)/BreadcrumbsSticky.tsx
@@ -38,7 +38,7 @@ export function BreadcrumbsSticky(
   return (
     <div
       ref={ref}
-      class={`-section-x-inset-xl top-0 sticky bg-white z-10 -my-3 py-3 ${
+      class={`-section-x-inset-xl top-0 sticky bg-white z-20 -my-3 py-3 ${
         sticky.value
           ? "border-b border-jsr-cyan-100 shadow-[0px_2px_4px_0px_rgba(209,235,253,0.40)]"
           : ""

diff --git a/frontend/routes/packages.tsx b/frontend/routes/packages.tsx
@@ -40,7 +40,8 @@ export default function PackageListPage({
 
         <div className="mt-2 flex flex-wrap items-start justify-between px-2">
           <span className="text-sm text-gray-400 block">
-            Changes made in the last 15 minutes may not be visible yet.
+            Changes made in the last 15 minutes may not be visible yet. Packages
+            with no published versions are not shown.
           </span>
           <div class="flex items-center gap-1">
             <span className="text-sm text-gray-500">powered by</span>

diff --git a/tools/orama_package_reindex.ts b/tools/orama_package_reindex.ts
@@ -39,14 +39,16 @@ while (true) {
   }
 }
 
-const entries: OramaPackageHit[] = packages.map((entry) => ({
-  scope: entry.scope,
-  name: entry.name,
-  description: entry.description,
-  runtimeCompat: entry.runtimeCompat,
-  score: entry.score,
-  id: `@${entry.scope}/${entry.name}`,
-}));
+const entries: OramaPackageHit[] = packages
+  .filter((entry) => entry.versionCount > 0)
+  .map((entry) => ({
+    scope: entry.scope,
+    name: entry.name,
+    description: entry.description,
+    runtimeCompat: entry.runtimeCompat,
+    score: entry.score,
+    id: `@${entry.scope}/${entry.name}`,
+  }));
 
 const res2 = await fetch(`${ORAMA_URL}/${index}/notify`, {
   method: "POST",