@spaceflow/publish 0.21.2 → 0.22.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spaceflow/publish",
-  "version": "0.21.2",
+  "version": "0.22.0",
   "description": "Spaceflow CI 发布插件，用于在发布流程中锁定/解锁分支",
   "license": "MIT",
   "author": "Lydanne",
@@ -21,13 +21,10 @@
   },
   "devDependencies": {
     "@types/node": "^22.15.0",
-    "@spaceflow/cli": "0.19.3"
+    "@spaceflow/cli": "0.20.0"
   },
   "peerDependencies": {
-    "@nestjs/common": "^11.0.1",
-    "@nestjs/config": "^4.0.2",
-    "nest-commander": "^3.20.1",
-    "@spaceflow/core": "0.1.3"
+    "@spaceflow/core": "0.2.0"
   },
   "spaceflow": {
     "type": "flow",

package/src/index.ts

@@ -1,30 +1,68 @@
 import "./locales";
-import { SpaceflowExtension, SpaceflowExtensionMetadata, t } from "@spaceflow/core";
-import { PublishModule } from "./publish.module";
+import { defineExtension, t } from "@spaceflow/core";
+import type { GitProviderService, ConfigReaderService } from "@spaceflow/core";
 import { publishSchema } from "./publish.config";
-/** publish Extension 元数据 */
-export const publishMetadata: SpaceflowExtensionMetadata = {
+import { PublishService } from "./publish.service";
+import { MonorepoService } from "./monorepo.service";
+
+export const extension = defineExtension({
   name: "publish",
-  commands: ["publish"],
-  configKey: "publish",
-  configSchema: () => publishSchema,
   version: "1.0.0",
   description: t("publish:extensionDescription"),
-};
+  configKey: "publish",
+  configSchema: () => publishSchema,
+  commands: [
+    {
+      name: "publish",
+      description: t("publish:description"),
+      options: [
+        { flags: "-d, --dry-run", description: t("common.options.dryRun") },
+        { flags: "-c, --ci", description: t("common.options.ci") },
+        { flags: "-p, --prerelease <tag>", description: t("publish:options.prerelease") },
+        { flags: "-r, --rehearsal", description: t("publish:options.rehearsal") },
+      ],
+      run: async (_args, options, ctx) => {
+        const gitProvider = ctx.getService<GitProviderService>("gitProvider");
+        const configReader = ctx.getService<ConfigReaderService>("config");
+
+        if (!gitProvider) {
+          ctx.output.error("publish 命令需要配置 Git Provider");
+          process.exit(1);
+        }
+
+        const monorepoService = new MonorepoService();
+        const publishService = new PublishService(
+          gitProvider,
+          ctx.config,
+          configReader,
+          monorepoService,
+        );
 
-export class PublishExtension implements SpaceflowExtension {
-  getMetadata(): SpaceflowExtensionMetadata {
-    return publishMetadata;
-  }
+        const publishOptions = {
+          dryRun: !!options?.dryRun,
+          ci: !!options?.ci,
+          prerelease: options?.prerelease as string,
+          rehearsal: !!options?.rehearsal,
+        };
 
-  getModule() {
-    return PublishModule;
-  }
-}
+        if (publishOptions.rehearsal) {
+          console.log(t("publish:rehearsalMode"));
+        } else if (publishOptions.dryRun) {
+          console.log(t("publish:dryRunMode"));
+        }
 
-export default PublishExtension;
+        try {
+          const context = publishService.getContextFromEnv(publishOptions);
+          await publishService.execute(context);
+        } catch (error) {
+          ctx.output.error(
+            t("common.executionFailed", { error: error instanceof Error ? error.message : error }),
+          );
+          process.exit(1);
+        }
+      },
+    },
+  ],
+});
 
-export * from "./publish.command";
-export * from "./publish.service";
-export * from "./publish.module";
-export * from "./monorepo.service";
+export default extension;

package/src/monorepo.service.ts

@@ -1,4 +1,3 @@
-import { Injectable } from "@nestjs/common";
 import { execSync } from "child_process";
 import { existsSync, readFileSync } from "fs";
 import { join } from "path";
@@ -21,7 +20,6 @@ export interface MonorepoAnalysisResult {
   packagesToPublish: PackageInfo[];
 }
 
-@Injectable()
 export class MonorepoService {
   private readonly cwd: string;
 

package/src/publish.service.ts

@@ -1,10 +1,9 @@
-import { Injectable } from "@nestjs/common";
-import { ConfigService } from "@nestjs/config";
 import {
   GitProviderService,
-  ConfigReaderService,
+  type ConfigReaderService,
+  type IConfigReader,
   type BranchProtection,
-  type CiConfig,
+  ciConfig,
 } from "@spaceflow/core";
 import { type PublishConfig } from "./publish.config";
 import { MonorepoService, type PackageInfo } from "./monorepo.service";
@@ -19,7 +18,13 @@ const releaseItModule = require("release-it") as
 
 const releaseIt = typeof releaseItModule === "function" ? releaseItModule : releaseItModule.default;
 
-import type { PublishOptions } from "./publish.command";
+export interface PublishOptions {
+  dryRun: boolean;
+  ci: boolean;
+  prerelease?: string;
+  /** 预演模式：执行 hooks 但不修改文件/git */
+  rehearsal: boolean;
+}
 
 export interface PublishContext extends PublishOptions {
   owner: string;
@@ -48,7 +53,6 @@ interface ReleaseItConfigOptions {
   publishConf: PublishConfig;
 }
 
-@Injectable()
 export class PublishService {
   private cleanupOnExit: (() => void) | null = null;
   private uncaughtExceptionHandler: ((err: Error) => void) | null = null;
@@ -56,7 +60,7 @@ export class PublishService {
 
   constructor(
     protected readonly gitProvider: GitProviderService,
-    protected readonly configService: ConfigService,
+    protected readonly config: IConfigReader,
     protected readonly configReader: ConfigReaderService,
     protected readonly monorepoService: MonorepoService,
   ) {}
@@ -64,9 +68,9 @@ export class PublishService {
   getContextFromEnv(options: PublishOptions): PublishContext {
     this.gitProvider.validateConfig();
 
-    const ciConf = this.configService.get<CiConfig>("ci");
-    const repository = ciConf?.repository;
-    const branch = ciConf?.refName;
+    const ciConf = ciConfig();
+    const repository = ciConf.repository;
+    const branch = ciConf.refName;
 
     if (!repository) {
       throw new Error("缺少配置 ci.repository (环境变量 GITHUB_REPOSITORY)");

package/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../core/tsconfig.skill.json",
+  "extends": "../../packages/core/tsconfig.skill.json",
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist"]
 }

package/src/publish.command.ts

@@ -1,71 +0,0 @@
-import { Command, CommandRunner, Option } from "nest-commander";
-import { t } from "@spaceflow/core";
-import { PublishService } from "./publish.service";
-
-export interface PublishOptions {
-  dryRun: boolean;
-  ci: boolean;
-  prerelease?: string;
-  /** 预演模式：执行 hooks 但不修改文件/git */
-  rehearsal: boolean;
-}
-
-@Command({
-  name: "publish",
-  description: t("publish:description"),
-})
-export class PublishCommand extends CommandRunner {
-  constructor(protected readonly publishService: PublishService) {
-    super();
-  }
-
-  async run(_passedParams: string[], options: PublishOptions): Promise<void> {
-    if (options.rehearsal) {
-      console.log(t("publish:rehearsalMode"));
-    } else if (options.dryRun) {
-      console.log(t("publish:dryRunMode"));
-    }
-
-    try {
-      const context = this.publishService.getContextFromEnv(options);
-      await this.publishService.execute(context);
-    } catch (error) {
-      console.error(
-        t("common.executionFailed", { error: error instanceof Error ? error.message : error }),
-      );
-      process.exit(1);
-    }
-  }
-
-  @Option({
-    flags: "-d, --dry-run",
-    description: t("common.options.dryRun"),
-  })
-  parseDryRun(val: boolean): boolean {
-    return val;
-  }
-
-  @Option({
-    flags: "-c, --ci",
-    description: t("common.options.ci"),
-  })
-  parseCi(val: boolean): boolean {
-    return val;
-  }
-
-  @Option({
-    flags: "-p, --prerelease <tag>",
-    description: t("publish:options.prerelease"),
-  })
-  parsePrerelease(val: string): string {
-    return val;
-  }
-
-  @Option({
-    flags: "-r, --rehearsal",
-    description: t("publish:options.rehearsal"),
-  })
-  parseRehearsal(val: boolean): boolean {
-    return val;
-  }
-}

package/src/publish.module.ts

@@ -1,12 +0,0 @@
-import { Module } from "@nestjs/common";
-import { ConfigModule } from "@nestjs/config";
-import { GitProviderModule, ConfigReaderModule, ciConfig } from "@spaceflow/core";
-import { PublishCommand } from "./publish.command";
-import { PublishService } from "./publish.service";
-import { MonorepoService } from "./monorepo.service";
-
-@Module({
-  imports: [ConfigModule.forFeature(ciConfig), GitProviderModule.forFeature(), ConfigReaderModule],
-  providers: [PublishCommand, PublishService, MonorepoService],
-})
-export class PublishModule {}