Merge pull request #21 from syi0808/fix/crates-dry-run-sibling-deps

fix: dry-run validation for workspace crates with internal dependencies

Author: syi0808

packages/core/src/config/types.ts

@@ -74,6 +74,8 @@ export interface PubmConfig {
   rollbackStrategy?: "individual" | "all";
   rollback?: RollbackConfig;
   lockfileSync?: "required" | "optional" | "skip";
+  /** Skip dry-run validation during prepare phase. @default false */
+  skipDryRun?: boolean;
   ecosystems?: Record<string, EcosystemConfig>;
   plugins?: PubmPlugin[];
   compress?: CompressOption;
@@ -107,6 +109,7 @@ export interface ResolvedPubmConfig
       | "ecosystems"
       | "testScript"
       | "buildScript"
+      | "skipDryRun"
     >
   > {
   compress?: CompressOption;
@@ -123,6 +126,7 @@ export interface ResolvedPubmConfig
   ecosystems: Record<string, EcosystemConfig>;
   testScript?: string;
   buildScript?: string;
+  skipDryRun?: boolean;
   discoveryEmpty?: boolean;
 }
 

packages/core/src/i18n/locales/de.json

@@ -269,6 +269,7 @@
   "cli.option.noTests": "Tests vor der Veröffentlichung überspringen",
   "cli.option.noBuild": "Build vor der Veröffentlichung überspringen",
   "cli.option.noPublish": "Veröffentlichungsaufgabe überspringen",
+  "cli.option.noDryRunValidation": "Dry-Run-Validierung in der Vorbereitungsphase überspringen",
   "cli.option.skipRelease": "GitHub Release-Erstellung überspringen",
   "cli.option.tag": "Unter einem bestimmten dist-tag veröffentlichen",
   "cli.option.contents": "Unterverzeichnis zum Veröffentlichen",

packages/core/src/i18n/locales/en.json

@@ -269,6 +269,7 @@
   "cli.option.noTests": "Skip running tests before publishing",
   "cli.option.noBuild": "Skip build before publishing",
   "cli.option.noPublish": "Skip publishing task",
+  "cli.option.noDryRunValidation": "Skip dry-run validation during prepare phase",
   "cli.option.skipRelease": "Skip GitHub Release creation",
   "cli.option.tag": "Publish under a specific dist-tag",
   "cli.option.contents": "Subdirectory to publish",

packages/core/src/i18n/locales/es.json

@@ -269,6 +269,7 @@
   "cli.option.noTests": "Omitir la ejecución de pruebas antes de publicar",
   "cli.option.noBuild": "Omitir la construcción antes de publicar",
   "cli.option.noPublish": "Omitir la tarea de publicación",
+  "cli.option.noDryRunValidation": "Omitir la validación dry-run durante la fase de preparación",
   "cli.option.skipRelease": "Omitir la creación de GitHub Release",
   "cli.option.tag": "Publicar bajo un dist-tag específico",
   "cli.option.contents": "Subdirectorio a publicar",

packages/core/src/i18n/locales/fr.json

@@ -269,6 +269,7 @@
   "cli.option.noTests": "Ignorer l'exécution des tests avant la publication",
   "cli.option.noBuild": "Ignorer la construction avant la publication",
   "cli.option.noPublish": "Ignorer la tâche de publication",
+  "cli.option.noDryRunValidation": "Ignorer la validation dry-run pendant la phase de préparation",
   "cli.option.skipRelease": "Ignorer la création de la GitHub Release",
   "cli.option.tag": "Publier sous un dist-tag spécifique",
   "cli.option.contents": "Sous-répertoire à publier",

packages/core/src/i18n/locales/ko.json

@@ -269,6 +269,7 @@
   "cli.option.noTests": "배포 전 테스트 실행 건너뜀",
   "cli.option.noBuild": "배포 전 빌드 건너뜀",
   "cli.option.noPublish": "배포 작업 건너뜀",
+  "cli.option.noDryRunValidation": "준비 단계에서 드라이런 검증을 건너뜁니다",
   "cli.option.skipRelease": "GitHub Release 생성 건너뜀",
   "cli.option.tag": "특정 dist-tag로 배포",
   "cli.option.contents": "배포할 하위 디렉토리",

packages/core/src/i18n/locales/zh-cn.json

@@ -269,6 +269,7 @@
   "cli.option.noTests": "跳过发布前运行测试",
   "cli.option.noBuild": "跳过发布前构建",
   "cli.option.noPublish": "跳过发布任务",
+  "cli.option.noDryRunValidation": "跳过准备阶段的试运行验证",
   "cli.option.skipRelease": "跳过 GitHub Release 创建",
   "cli.option.tag": "以特定 dist-tag 发布",
   "cli.option.contents": "要发布的子目录",

packages/core/src/tasks/dry-run-publish.ts

@@ -126,31 +126,41 @@ async function getCrateName(packagePath: string): Promise<string> {
 }
 
 const MISSING_CRATE_PATTERN = /no matching package named `([^`]+)` found/;
+const VERSION_MISMATCH_PATTERN =
+  /failed to select a version for the requirement `([^=`\s]+)/;
 
 async function findUnpublishedSiblingDeps(
   packagePath: string,
-  siblingPaths: string[],
+  siblingKeys: string[],
+  ctx: PubmContext,
 ): Promise<string[]> {
   const eco = new RustEcosystem(packagePath);
   const deps = await eco.dependencies();
 
-  const siblingNameToPath = new Map<string, string>();
+  const siblingNameToKey = new Map<string, string>();
   await Promise.all(
-    siblingPaths.map(async (p) => {
-      const name = await getCrateName(p);
-      siblingNameToPath.set(name, p);
+    siblingKeys.map(async (k) => {
+      const name = await getCrateName(pathFromKey(k));
+      siblingNameToKey.set(name, k);
     }),
   );
 
-  const siblingDeps = deps.filter((d) => siblingNameToPath.has(d));
+  const siblingDeps = deps.filter((d) => siblingNameToKey.has(d));
 
   const results = await Promise.all(
     siblingDeps.map(async (name) => {
-      const siblingPath = siblingNameToPath.get(name);
-      if (!siblingPath) {
-        throw new Error(`Missing sibling crate path for dependency: ${name}`);
+      const siblingKey = siblingNameToKey.get(name);
+      if (!siblingKey) {
+        throw new Error(`Missing sibling crate key for dependency: ${name}`);
       }
+      const siblingPath = pathFromKey(siblingKey);
       const registry = await cratesPackageRegistry(siblingPath);
+      const version = getPackageVersion(ctx, siblingKey);
+      if (version) {
+        const versionPublished = await registry.isVersionPublished(version);
+        return versionPublished ? null : name;
+      }
+      // Fallback: check if the crate exists at all
       const published = await registry.isPublished();
       return published ? null : name;
     }),
@@ -164,7 +174,6 @@ export function createCratesDryRunPublishTask(
   siblingKeys?: string[],
 ): ListrTask<PubmContext> {
   const packagePath = pathFromKey(key);
-  const siblingPaths = siblingKeys?.map(pathFromKey);
   return {
     title: t("task.dryRun.crates.title", { path: packagePath }),
     task: async (ctx, task): Promise<void> => {
@@ -185,11 +194,12 @@ export function createCratesDryRunPublishTask(
         return task.skip();
       }
 
-      // Proactive: skip if any sibling dependency is not yet on crates.io
-      if (siblingPaths?.length) {
+      // Proactive: skip if any sibling dependency's new version is not yet on crates.io
+      if (siblingKeys?.length) {
         const unpublished = await findUnpublishedSiblingDeps(
           packagePath,
-          siblingPaths,
+          siblingKeys,
+          ctx,
         );
         if (unpublished.length > 0) {
           task.title = t("task.dryRun.crates.skippedSibling", {
@@ -209,15 +219,18 @@ export function createCratesDryRunPublishTask(
       } catch (error) {
         // Reactive fallback: catch sibling-related errors
         const message = error instanceof Error ? error.message : String(error);
-        const match = message.match(MISSING_CRATE_PATTERN);
-        if (match && siblingPaths) {
+        const missingMatch = message.match(MISSING_CRATE_PATTERN);
+        const versionMatch = message.match(VERSION_MISMATCH_PATTERN);
+        const crateName = missingMatch?.[1] ?? versionMatch?.[1]?.trim();
+
+        if (crateName && siblingKeys) {
           const siblingNames = await Promise.all(
-            siblingPaths.map((p) => getCrateName(p)),
+            siblingKeys.map((k) => getCrateName(pathFromKey(k))),
           );
-          if (siblingNames.includes(match[1])) {
+          if (siblingNames.includes(crateName)) {
             task.title = t("task.dryRun.crates.skippedSibling", {
               path: packagePath,
-              crate: match[1],
+              crate: crateName,
             });
             return;
           }

packages/core/src/tasks/phases/dry-run.ts

@@ -21,10 +21,11 @@ export function createDryRunTasks(
   dryRun: boolean,
   mode: string,
   hasPrepare: boolean,
+  skipDryRun: boolean,
 ): ListrTask<PubmContext>[] {
   return [
     {
-      enabled: dryRun || (mode === "ci" && hasPrepare),
+      enabled: !skipDryRun && (dryRun || (mode === "ci" && hasPrepare)),
       title: t("task.dryRunValidation.title"),
       task: async (ctx, parentTask): Promise<Listr<PubmContext>> => {
         await resolveWorkspaceProtocols(ctx);
@@ -47,7 +48,7 @@ export function createDryRunTasks(
       },
     },
     {
-      enabled: dryRun || (mode === "ci" && hasPrepare),
+      enabled: !skipDryRun && (dryRun || (mode === "ci" && hasPrepare)),
       skip: (ctx) => !ctx.runtime.workspaceBackups?.size,
       title: t("task.dryRunValidation.restoreProtocols"),
       task: async (ctx) => {

packages/core/src/tasks/runner.ts

@@ -77,7 +77,12 @@ export async function run(ctx: PubmContext): Promise<void> {
         createBuildTask(hasPrepare, !!ctx.options.skipBuild),
         createVersionTask(hasPrepare, dryRun),
         ...createPublishTasks(hasPublish, dryRun, !!ctx.options.skipPublish),
-        ...createDryRunTasks(dryRun, mode, hasPrepare),
+        ...createDryRunTasks(
+          dryRun,
+          mode,
+          hasPrepare,
+          !!ctx.options.skipDryRun,
+        ),
         createPushTask(hasPrepare, dryRun),
         createReleaseTask(
           hasPublish,