@atomservice/cli 0.1.3 → 0.1.5

package/bin/atom.ts

@@ -2,6 +2,7 @@
 import { UserError } from "@atomservice/core"
 import { type ArgsDef, type CommandDef, defineCommand, renderUsage, runCommand, runMain } from "citty"
 import pc from "picocolors"
+import pkg from "../package.json" with { type: "json" }
 import { addCmd } from "../src/add/add.cmd.ts"
 import { initCmd } from "../src/init/init.cmd.ts"
 import { runCmd } from "../src/run/index.ts"
@@ -19,7 +20,7 @@ async function showUsage<T extends ArgsDef>(cmd: CommandDef<T>, parent?: Command
 }
 
 const main = defineCommand({
-  meta: { name: "atom", version: "0.0.1", description: "原子化自托管服务编排工具" },
+  meta: { name: "atom", version: pkg.version, description: "原子化自托管服务编排工具" },
   subCommands: async () => ({
     init: initCmd,
     add: addCmd,
@@ -37,9 +38,15 @@ const wantsHelpOrVersion =
   argv.includes("--help") || argv.includes("-h") || (argv.length === 1 && argv[0] === "--version")
 
 if (wantsHelpOrVersion) {
-  // help / version 由 citty 自带逻辑处理
   await runMain(main, { showUsage })
 } else {
+  const subCommands = await (main.subCommands as () => Promise<Record<string, unknown>>)()
+  const requested = argv.find((a) => !a.startsWith("-"))
+  if (requested && !(requested in subCommands)) {
+    console.error(`\n${pc.red("✗")} ${pc.yellow(requested)} 不是有效的命令\n`)
+    await showUsage(main)
+    process.exit(1)
+  }
   try {
     await runCommand(main, { rawArgs: argv })
   } catch (err) {
@@ -48,7 +55,7 @@ if (wantsHelpOrVersion) {
       if (err.hint) console.error(pc.dim(`  ${err.hint}`))
     } else {
       console.error(`\n${pc.red("✗")} ${err instanceof Error ? err.message : String(err)}`)
-      console.error(pc.dim("  如果这看起来是个 bug，可加 --verbose 查看详细堆栈"))
+      console.error(pc.dim("  遇到意外错误，使用 --verbose 查看错误详情"))
       if (process.env.ATOMSERVICE_VERBOSE && err instanceof Error && err.stack) {
         console.error(pc.dim(err.stack))
       }

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@atomservice/cli",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "atomservice 命令行工具（atom）：init / run / add / service",
   "type": "module",
   "author": "openorson",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/openorson/atomservice.git",
-    "directory": "packages/cli"
+    "directory": "framework/cli"
   },
   "bugs": "https://github.com/openorson/atomservice/issues",
-  "homepage": "https://github.com/openorson/atomservice/tree/main/packages/cli#readme",
+  "homepage": "https://github.com/openorson/atomservice/tree/main/framework/cli#readme",
   "keywords": [
     "atomservice",
     "cli",
@@ -19,7 +19,7 @@
     "bun"
   ],
   "engines": {
-    "bun": ">=1.0.0"
+    "bun": ">=1.3.14"
   },
   "files": [
     "src",
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@clack/prompts": "1.5.0",
-    "@atomservice/core": "0.1.3",
+    "@atomservice/core": "0.1.5",
     "citty": "0.2.2",
     "cli-table3": "0.6.5",
     "log-update": "8.0.0",

package/src/cli.consts.ts

@@ -4,11 +4,11 @@ import { ATOMSERVICE_DIR } from "@atomservice/core"
 export const CONFIG_PATH = path.join(ATOMSERVICE_DIR, "atom.config.ts")
 
 export const OFFICIAL_SERVICES: Array<{ value: string; label: string; hint: string }> = [
-  { value: "service-redis", label: "service-redis", hint: "Redis 缓存" },
-  { value: "service-postgres", label: "service-postgres", hint: "PostgreSQL 数据库" },
-  { value: "service-gateway", label: "service-gateway", hint: "反向代理 + HTTPS" },
-  { value: "service-gitea", label: "service-gitea", hint: "Gitea Git 服务" },
-  { value: "service-config", label: "service-config", hint: "通用配置中心" },
-  { value: "service-app", label: "service-app", hint: "容器化后端应用部署" },
-  { value: "service-site", label: "service-site", hint: "静态网站部署" },
+  { value: "redis", label: "redis", hint: "Redis 缓存" },
+  { value: "postgres", label: "postgres", hint: "PostgreSQL 数据库" },
+  { value: "gateway", label: "gateway", hint: "反向代理 + HTTPS" },
+  { value: "gitea", label: "gitea", hint: "Gitea Git 服务" },
+  { value: "config", label: "config", hint: "通用配置中心" },
+  { value: "app", label: "app", hint: "容器化后端应用部署" },
+  { value: "site", label: "site", hint: "静态网站部署" },
 ]

package/src/init/init.cmd.ts

@@ -12,10 +12,7 @@ async function ensureDir() {
 
   const pkgPath = path.join(ATOMSERVICE_DIR, "package.json")
   if (!fs.existsSync(pkgPath)) {
-    await Bun.write(
-      pkgPath,
-      `${JSON.stringify({ name: "atomservice-config", private: true, type: "module" }, null, 2)}\n`,
-    )
+    await Bun.write(pkgPath, `${JSON.stringify({ name: "atomconfig", private: true, type: "module" }, null, 2)}\n`)
   }
 }