pkg-pr-new 0.0.60 → 0.0.62

package/index.ts

@@ -13,6 +13,7 @@ import {
   abbreviateCommitHash,
   extractOwnerAndRepo,
   extractRepository,
+  installCommands,
 } from "@pkg-pr-new/utils";
 import { glob } from "tinyglobby";
 import ignore from "ignore";
@@ -143,20 +144,25 @@ const main = defineCommand({
           const isOnlyTemplates = !!args["only-templates"];
           const isBinaryApplication = !!args.bin;
           const comment: Comment = args.comment as Comment;
-          const selectedPackageManager = args.packageManager as
-            | "npm"
-            | "bun"
-            | "pnpm"
-            | "yarn";
-
-          if (
-            !["npm", "bun", "pnpm", "yarn"].includes(selectedPackageManager)
-          ) {
+          const selectedPackageManager = (args.packageManager as string)
+            .split(",")
+            .filter((s) => s.trim()) as Array<"npm" | "bun" | "pnpm" | "yarn">;
+          const packageManagers = ["npm", "bun", "pnpm", "yarn"];
+
+          if (!selectedPackageManager.length) {
             console.error(
-              `Unsupported package manager: ${selectedPackageManager}. Supported managers are npm, bun, pnpm, yarn.`,
+              `Unsupported package manager: ${args.packageManager}. Supported managers are npm, bun, pnpm, yarn.`,
             );
             process.exit(1);
           }
+          for (let i = 0; i < selectedPackageManager.length; i++) {
+            if (!packageManagers.includes(selectedPackageManager[i])) {
+              console.error(
+                `Unsupported package manager: ${selectedPackageManager[i]}. Supported managers are npm, bun, pnpm, yarn.`,
+              );
+              process.exit(1);
+            }
+          }
 
           if (!process.env.TEST && process.env.GITHUB_ACTIONS !== "true") {
             console.error(
@@ -185,17 +191,26 @@ const main = defineCommand({
 
           const key = hash(metadata);
 
-          const checkResponse = await fetch(new URL("/check", apiUrl), {
-            method: "POST",
-            body: JSON.stringify({
-              owner,
-              repo,
-              key,
-            }),
-          });
+          let checkResponse;
+          try {
+            checkResponse = await fetch(new URL("/check", apiUrl), {
+              method: "POST",
+              body: JSON.stringify({
+                owner,
+                repo,
+                key,
+              }),
+            });
+          } catch (error) {
+            console.error(`Failed to connect to server: ${error}`);
+            process.exit(1);
+          }
 
           if (!checkResponse.ok) {
-            console.error(await checkResponse.text());
+            const errorText = await checkResponse.text();
+            console.error(
+              `Check failed (${checkResponse.status}): ${errorText}`,
+            );
             process.exit(1);
           }
 
@@ -241,12 +256,26 @@ const main = defineCommand({
             realDeps?.set(pJson.name, pJson.version ?? longDepUrl);
 
             const controller = new AbortController();
-            const resource = await fetch(longDepUrl, {
-              signal: controller.signal,
-            });
-            if (resource.ok) {
+            try {
+              const resource = await fetch(longDepUrl, {
+                signal: controller.signal,
+              });
+              if (resource.ok) {
+                console.warn(
+                  `${pJson.name}@${formattedSha} was already published on ${longDepUrl}`,
+                );
+              } else if (resource.status >= 500) {
+                console.warn(
+                  `Server error checking ${longDepUrl} (${resource.status}), proceeding with publish`,
+                );
+              } else {
+                console.warn(
+                  `Unexpected response checking ${longDepUrl} (${resource.status})`,
+                );
+              }
+            } catch (error) {
               console.warn(
-                `${pJson.name}@${formattedSha} was already published on ${longDepUrl}`,
+                `Failed to check if package exists at ${longDepUrl}: ${error}`,
               );
             }
             controller.abort();
@@ -511,17 +540,26 @@ const main = defineCommand({
               "sb-shasums": JSON.stringify(shasums),
               "sb-run-id": GITHUB_RUN_ID,
               "sb-bin": `${isBinaryApplication}`,
-              "sb-package-manager": selectedPackageManager,
+              "sb-package-manager": selectedPackageManager.join(","),
               "sb-only-templates": `${isOnlyTemplates}`,
             },
             body: formData,
           });
-          const laterRes = await res.clone().json();
-          assert.equal(
-            res.status,
-            200,
-            `publishing failed: ${await res.text()}`,
-          );
+
+          if (!res.ok) {
+            const errorText = await res.text();
+            console.error(`Publishing failed (${res.status}): ${errorText}`);
+            process.exit(1);
+          }
+
+          let laterRes;
+          try {
+            laterRes = await res.json();
+          } catch (error) {
+            console.error(`Failed to parse server response as JSON: ${error}`);
+            console.error(`Raw response: ${await res.text()}`);
+            process.exit(1);
+          }
 
           const debug = laterRes.debug;
 
@@ -544,7 +582,7 @@ const main = defineCommand({
               return `${packageName}:
 - sha: ${shasums[packageName]}
 - publint: ${publintUrl}
-- npm: npm i ${url}`;
+- ${packMethod}: ${installCommands[packMethod]} ${url}`;
             })
             .join("\n\n");
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pkg-pr-new",
-  "version": "0.0.60",
+  "version": "0.0.62",
   "description": "",
   "main": "index.js",
   "type": "module",