@wangzhanpeng996/wzp 0.1.1 → 0.1.2

package/README.md

@@ -11,15 +11,6 @@
 
 ## 安装
 
-本机开发调试：
-
-```powershell
-npm link
-wzp --help
-```
-
-发布到 npm 后：
-
 ```powershell
 npm i -g @wangzhanpeng996/wzp
 ```
@@ -32,41 +23,40 @@ npm i -g @wangzhanpeng996/wzp
 $env:GITEE_TOKEN="你的Gitee访问令牌"
 ```
 
-然后在你希望生成项目的目录里执行：
+基本用法：
 
 ```powershell
-wzp gitee-create https://gitee.com/wzplxt/web1.git my-new-repo
+wzp gitee-create <源仓库地址> [新仓库名] [源分支名]
 ```
 
-也可以使用具名参数：
+示例：
 
 ```powershell
-wzp gitee-create `
-  --source https://gitee.com/wzplxt/web1.git `
-  --repo my-new-repo `
-  --description "我的新项目" `
-  --private `
-  --no-push
+wzp gitee-create https://gitee.com/wzplxt/web1.git
+wzp gitee-create https://gitee.com/wzplxt/web1.git recruitment
+wzp gitee-create https://gitee.com/wzplxt/web1.git recruitment Paddy
 ```
 
-它会做这些事：
+含义：
 
-1. 检查 `GITEE_TOKEN`，令牌缺失或无效会直接退出。
-2. 在 Gitee 当前 token 对应的个人账号下创建新仓库。
-3. 把源仓库克隆到当前运行目录下的 `my-new-repo` 文件夹。
-4. 删除克隆下来的原 `.git`。
-5. 重新执行 `git init`。
-6. 把 `origin` 指向新 Gitee 仓库，默认优先使用 HTTPS 地址。
-7. 执行 `git add .` 和一次初始化提交。
-8. 默认继续推送到新 Gitee 仓库；如果加了 `--no-push`，只在本地准备好。
+- 第 1 个参数是源仓库地址，必填。
+- 第 2 个参数是新仓库名，可选；不填时从源仓库地址自动提取，例如 `web1.git` 会提取为 `web1`。
+- 第 3 个参数是源分支名，可选；不填时克隆源仓库默认分支。
 
-如果加了 `--no-push`，最后会提示完整推送命令，例如：
+可选参数：
 
 ```powershell
-git -C "F:\0.代码\脚手架维护\test\my-new-repo" push -u origin HEAD
+--description "仓库简介"
+--private
+--no-push
 ```
 
-## 发布
+默认行为：
+
+- 默认创建公开仓库。
+- 默认自动推送到新 Gitee 仓库。
+- 如果加 `--private`，创建私有仓库。
+- 如果加 `--no-push`，只在本地准备好，不推送。
 
 ## kill
 
@@ -82,22 +72,11 @@ Windows 下会查找正在监听该 TCP 端口的进程，然后执行：
 taskkill /PID <进程ID> /F
 ```
 
-如果没有进程监听该端口，会直接提示无需处理。
-
 ## 发布
 
-如果这是第一次发布 `wzp` 这个新包名：
-
-```powershell
-npm login
-npm publish --access=public --otp=你的6位验证码
-```
-
-后续更新：
-
 ```powershell
 npm version patch
-npm publish --access=public --otp=你的6位验证码
+npm publish --access=public
 ```
 
 别人更新：
@@ -105,15 +84,3 @@ npm publish --access=public --otp=你的6位验证码
 ```powershell
 npm i -g @wangzhanpeng996/wzp@latest
 ```
-
-## 继续扩展新功能
-
-以后新增功能时，在 `bin/wzp.js` 里增加新的子命令分支即可，例如：
-
-```text
-wzp md-init
-wzp env-check
-wzp config
-```
-
-推荐把 `wzp` 作为总入口，把具体能力都放在子命令里。

package/bin/wzp.js

@@ -2,10 +2,9 @@
 
 import { spawn } from "node:child_process";
 import { existsSync } from "node:fs";
-import { mkdir, readdir, rm, writeFile } from "node:fs/promises";
-import { basename, dirname, isAbsolute, join, resolve } from "node:path";
+import { mkdir, readdir, rm } from "node:fs/promises";
+import { dirname, isAbsolute, resolve } from "node:path";
 import process from "node:process";
-import readline from "node:readline/promises";
 
 const globalHelp = `
 用法:
@@ -18,31 +17,34 @@ const globalHelp = `
   kill-port       kill 的兼容别名
 
 示例:
-  wzp gitee-create https://gitee.com/wzplxt/web1.git my-new-repo
-  wzp gitee-create --source https://gitee.com/wzplxt/web1.git --repo my-new-repo
+  wzp gitee-create https://gitee.com/wzplxt/web1.git
+  wzp gitee-create https://gitee.com/wzplxt/web1.git recruitment
+  wzp gitee-create https://gitee.com/wzplxt/web1.git recruitment Paddy
   wzp kill 8080
-
-查看子命令帮助:
-  wzp gitee-create --help
-  wzp kill --help
 `;
 
 const giteeCreateHelp = `
 用法:
-  wzp gitee-create <源仓库地址> <新仓库名>
-  wzp gitee-create --source <源仓库地址> --repo <新仓库名>
+  wzp gitee-create <源仓库地址> [新仓库名] [源分支名]
+
+参数:
+  源仓库地址      必填。要克隆的原项目地址
+  新仓库名        可选。不填时从源仓库地址里自动提取
+  源分支名        可选。不填时克隆源仓库默认分支
 
-常用参数:
-  --source <url>          要克隆的原项目地址，也可以作为第 1 个位置参数
-  --repo <name>           新 Gitee 仓库路径名，也会作为当前目录下的新项目文件夹名
+选项:
   --description <text>    Gitee 仓库简介
   --private               创建私有 Gitee 仓库
   --no-push               初始化提交后不推送到 origin
   -h, --help              显示帮助
 
-认证方式:
-  启动后会检查环境变量 GITEE_TOKEN。没有令牌或令牌无效会直接退出。
-  不要把 Gitee 密码写进命令或脚本。推送认证交给本机 git 凭据管理器。
+示例:
+  wzp gitee-create https://gitee.com/wzplxt/web1.git
+  wzp gitee-create https://gitee.com/wzplxt/web1.git recruitment
+  wzp gitee-create https://gitee.com/wzplxt/web1.git recruitment Paddy
+
+认证:
+  需要先设置环境变量 GITEE_TOKEN。没有令牌或令牌无效会直接退出。
 `;
 
 const killHelp = `
@@ -52,10 +54,6 @@ const killHelp = `
 
 示例:
   wzp kill 8080
-
-说明:
-  Windows 下会查找正在监听该 TCP 端口的进程，并执行 taskkill /F。
-  请只对你确认可以关闭的本地开发服务使用。
 `;
 
 main().catch((error) => {
@@ -82,168 +80,142 @@ async function main() {
     return;
   }
 
-  throw new Error(`未知命令: ${command}\n\n${globalHelp.trim()}`);
-}
-
-async function runKillPort(args) {
-  if (args.includes("--help") || args.includes("-h")) {
-    console.log(killHelp.trim());
-    return;
-  }
-
-  const port = args.find((arg) => !arg.startsWith("-"));
-  if (!port || !/^\d+$/.test(port)) {
-    throw new Error("缺少端口号，例如: wzp kill 8080");
-  }
-
-  const portNumber = Number(port);
-  if (portNumber < 1 || portNumber > 65535) {
-    throw new Error("端口号必须在 1 到 65535 之间");
-  }
-
-  if (process.platform === "win32") {
-    await killPortOnWindows(portNumber);
-    return;
-  }
-
-  await killPortOnUnix(portNumber);
+  throw new Error(`未知命令: ${command}`);
 }
 
 async function runGiteeCreate(args) {
-  const parsed = parseArgs(args);
+  const parsed = parseGiteeCreateArgs(args);
   if (parsed.help) {
     console.log(giteeCreateHelp.trim());
     return;
   }
 
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout
-  });
+  const source = parsed.positionals[0];
+  if (!source) {
+    throw new Error("缺少源仓库地址，例如: wzp gitee-create https://gitee.com/wzplxt/web1.git");
+  }
 
-  try {
-    const source = await requiredValue(rl, parsed, "source", "源仓库地址");
-    const repo = await requiredValue(rl, parsed, "repo", "新仓库名");
-    const authUser = await validateGiteeToken(process.env.GITEE_TOKEN);
-    console.log(`Gitee 令牌有效，当前用户: ${authUser.login || authUser.name || authUser.id}`);
+  const repo = parsed.positionals[1] || inferRepoName(source);
+  const branch = parsed.positionals[2];
+  const authUser = await validateGiteeToken(process.env.GITEE_TOKEN);
+  console.log(`Gitee 令牌有效，当前用户: ${authUser.login || authUser.name || authUser.id}`);
 
-    const target = resolve(process.cwd(), repo);
-    const push = !parsed.options.noPush;
+  const target = resolve(process.cwd(), repo);
+  const push = !parsed.options.noPush;
 
-    await ensureTargetAvailable(target);
+  await ensureTargetAvailable(target);
 
-    const remote = await createGiteeRepo({
-      owner: authUser.login,
-      repo,
-      name: repo,
-      description: parsed.options.description ?? "",
-      isPrivate: Boolean(parsed.options.private),
-      token: process.env.GITEE_TOKEN
-    });
+  const remote = await createGiteeRepo({
+    owner: authUser.login,
+    repo,
+    name: repo,
+    description: parsed.options.description ?? "",
+    isPrivate: Boolean(parsed.options.private),
+    token: process.env.GITEE_TOKEN
+  });
+
+  const cloneArgs = ["clone"];
+  if (branch) {
+    cloneArgs.push("--branch", branch, "--single-branch");
+  }
+  cloneArgs.push(source, target);
 
-    await run("git", ["clone", source, target]);
-    await detachGitHistory(target);
-    await run("git", ["init"], { cwd: target });
-    await run("git", ["remote", "add", "origin", remote], { cwd: target });
-    await run("git", ["add", "."], { cwd: target });
-    await run("git", ["commit", "-m", "初始化项目"], { cwd: target, allowFailure: true });
+  await run("git", cloneArgs);
+  await detachGitHistory(target);
+  await run("git", ["init"], { cwd: target });
+  await run("git", ["remote", "add", "origin", remote], { cwd: target });
+  await run("git", ["add", "."], { cwd: target });
+  await run("git", ["commit", "-m", "初始化项目"], { cwd: target, allowFailure: true });
 
-    if (push) {
-      await run("git", ["push", "-u", "origin", "HEAD"], { cwd: target });
-    }
+  if (push) {
+    await run("git", ["push", "-u", "origin", "HEAD"], { cwd: target });
+  }
 
-    console.log("\n完成");
-    console.log(`本地目录: ${target}`);
-    console.log(`新 remote: ${remote}`);
-    if (!push) {
-      console.log(`尚未推送。确认无误后可执行: git -C "${target}" push -u origin HEAD`);
-    }
-  } finally {
-    rl.close();
+  console.log("\n完成");
+  console.log(`本地目录: ${target}`);
+  console.log(`新 remote: ${remote}`);
+  if (branch) {
+    console.log(`源分支: ${branch}`);
+  }
+  if (!push) {
+    console.log(`尚未推送。确认无误后可执行: git -C "${target}" push -u origin HEAD`);
   }
 }
 
-function parseArgs(args) {
+function parseGiteeCreateArgs(args) {
   const result = {
     help: args.includes("--help") || args.includes("-h"),
-    options: {}
+    options: {},
+    positionals: []
   };
 
-  const positionals = [];
   for (let i = 0; i < args.length; i += 1) {
     const arg = args[i];
     if (arg === "--help" || arg === "-h") {
       continue;
     }
-    if (!arg.startsWith("--")) {
-      positionals.push(arg);
+    if (arg === "--private") {
+      result.options.private = true;
       continue;
     }
-
-    const [rawKey, inlineValue] = arg.slice(2).split("=", 2);
-    const key = toCamelCase(rawKey);
-    if (["private", "noPush"].includes(key)) {
-      result.options[key] = true;
+    if (arg === "--no-push") {
+      result.options.noPush = true;
       continue;
     }
-
-    const value = inlineValue ?? args[i + 1];
-    if (!value || value.startsWith("--")) {
-      throw new Error(`参数 --${rawKey} 缺少值`);
-    }
-    result.options[key] = value;
-    if (inlineValue === undefined) {
+    if (arg === "--description") {
+      const value = args[i + 1];
+      if (!value || value.startsWith("--")) {
+        throw new Error("参数 --description 缺少值");
+      }
+      result.options.description = value;
       i += 1;
+      continue;
     }
+    if (arg.startsWith("--description=")) {
+      result.options.description = arg.slice("--description=".length);
+      continue;
+    }
+    if (arg.startsWith("--")) {
+      throw new Error(`未知参数: ${arg}`);
+    }
+    result.positionals.push(arg);
   }
 
-  result.options.source ??= positionals[0];
-  result.options.repo ??= positionals[1];
-  return result;
-}
+  if (result.positionals.length > 3) {
+    throw new Error("位置参数太多。正确格式: wzp gitee-create <源仓库地址> [新仓库名] [源分支名]");
+  }
 
-function toCamelCase(value) {
-  return value.replace(/-([a-z])/g, (_, letter) => letter.toUpperCase());
+  return result;
 }
 
-async function requiredValue(rl, parsed, key, label) {
-  const current = parsed.options[key];
-  if (current) {
-    return current;
+function inferRepoName(source) {
+  const cleaned = source
+    .replace(/[?#].*$/, "")
+    .replace(/\/+$/, "")
+    .replace(/\.git$/i, "");
+  const name = cleaned.split(/[/:\\]/).filter(Boolean).pop();
+  if (!name) {
+    throw new Error("无法从源仓库地址推断新仓库名，请手动传入新仓库名");
   }
-  const answer = await rl.question(`${label}: `);
-  if (!answer.trim()) {
-    throw new Error(`缺少必填参数: ${label}`);
-  }
-  return answer.trim();
+  return name;
 }
 
-async function ensureTargetAvailable(target) {
-  if (!isAbsolute(target)) {
-    throw new Error("本地目标目录必须能解析为绝对路径");
-  }
-  if (!existsSync(dirname(target))) {
-    await mkdir(dirname(target), { recursive: true });
-  }
-  if (!existsSync(target)) {
-    return;
-  }
-  const entries = await readdir(target);
-  if (entries.length > 0) {
-    throw new Error(`目标目录已存在且不是空目录: ${target}`);
+async function validateGiteeToken(token) {
+  if (!token) {
+    throw new Error("缺少 GITEE_TOKEN。请先在当前 PowerShell 会话执行: $env:GITEE_TOKEN=\"你的Gitee访问令牌\"");
   }
-}
 
-async function detachGitHistory(target) {
-  const gitDir = join(target, ".git");
-  const resolvedGitDir = resolve(gitDir);
-  const resolvedTarget = resolve(target);
-  if (!resolvedGitDir.startsWith(`${resolvedTarget}\\`) && resolvedGitDir !== join(resolvedTarget, ".git")) {
-    throw new Error(`拒绝删除异常路径: ${resolvedGitDir}`);
-  }
-  if (existsSync(gitDir)) {
-    await rm(gitDir, { recursive: true, force: true });
+  const url = new URL("https://gitee.com/api/v5/user");
+  url.searchParams.set("access_token", token);
+  const response = await fetch(url);
+  const payload = await response.json().catch(() => ({}));
+
+  if (!response.ok || !payload.id) {
+    const message = payload.message || payload.error || response.statusText;
+    throw new Error(`GITEE_TOKEN 无效或权限不足: ${message}`);
   }
+
+  return payload;
 }
 
 async function createGiteeRepo({ owner, repo, name, description, isPrivate, token }) {
@@ -272,42 +244,54 @@ async function createGiteeRepo({ owner, repo, name, description, isPrivate, toke
   return payload.html_url || payload.ssh_url || `https://gitee.com/${owner}/${repo}.git`;
 }
 
-async function validateGiteeToken(token) {
-  if (!token) {
-    throw new Error("缺少 GITEE_TOKEN。请先在当前 PowerShell 会话执行: $env:GITEE_TOKEN=\"你的Gitee访问令牌\"");
+async function ensureTargetAvailable(target) {
+  if (!isAbsolute(target)) {
+    throw new Error("本地目标目录必须能解析为绝对路径");
+  }
+  if (!existsSync(dirname(target))) {
+    await mkdir(dirname(target), { recursive: true });
+  }
+  if (!existsSync(target)) {
+    return;
+  }
+  const entries = await readdir(target);
+  if (entries.length > 0) {
+    throw new Error(`目标目录已存在且不是空目录: ${target}`);
   }
+}
 
-  const url = new URL("https://gitee.com/api/v5/user");
-  url.searchParams.set("access_token", token);
-  const response = await fetch(url);
-  const payload = await response.json().catch(() => ({}));
+async function detachGitHistory(target) {
+  const gitDir = resolve(target, ".git");
+  const resolvedTarget = resolve(target);
+  if (!gitDir.startsWith(`${resolvedTarget}\\`) && gitDir !== resolve(resolvedTarget, ".git")) {
+    throw new Error(`拒绝删除异常路径: ${gitDir}`);
+  }
+  if (existsSync(gitDir)) {
+    await rm(gitDir, { recursive: true, force: true });
+  }
+}
 
-  if (!response.ok || !payload.id) {
-    const message = payload.message || payload.error || response.statusText;
-    throw new Error(`GITEE_TOKEN 无效或权限不足: ${message}`);
+async function runKillPort(args) {
+  if (args.includes("--help") || args.includes("-h")) {
+    console.log(killHelp.trim());
+    return;
   }
 
-  return payload;
-}
+  const port = args.find((arg) => !arg.startsWith("-"));
+  if (!port || !/^\d+$/.test(port)) {
+    throw new Error("缺少端口号，例如: wzp kill 8080");
+  }
 
-function run(command, args, options = {}) {
-  return new Promise((resolvePromise, reject) => {
-    console.log(`> ${command} ${args.join(" ")}`);
-    const child = spawn(command, args, {
-      cwd: options.cwd ?? process.cwd(),
-      stdio: "inherit",
-      shell: false
-    });
+  const portNumber = Number(port);
+  if (portNumber < 1 || portNumber > 65535) {
+    throw new Error("端口号必须在 1 到 65535 之间");
+  }
 
-    child.on("error", reject);
-    child.on("exit", (code) => {
-      if (code === 0 || options.allowFailure) {
-        resolvePromise();
-        return;
-      }
-      reject(new Error(`命令退出码 ${code}: ${command} ${args.join(" ")}`));
-    });
-  });
+  if (process.platform === "win32") {
+    await killPortOnWindows(portNumber);
+  } else {
+    await killPortOnUnix(portNumber);
+  }
 }
 
 async function killPortOnWindows(port) {
@@ -319,16 +303,11 @@ async function killPortOnWindows(port) {
     if (!trimmed || !trimmed.includes("LISTENING")) {
       continue;
     }
-
     const parts = trimmed.split(/\s+/);
     const localAddress = parts[1];
     const state = parts[3];
     const pid = parts[4];
-    if (state !== "LISTENING" || !pid) {
-      continue;
-    }
-
-    if (addressUsesPort(localAddress, port)) {
+    if (state === "LISTENING" && pid && addressUsesPort(localAddress, port)) {
       pids.add(pid);
     }
   }
@@ -342,16 +321,12 @@ async function killPortOnWindows(port) {
     console.log(`释放端口 ${port}: 结束 PID ${pid}`);
     await run("taskkill", ["/PID", pid, "/F"]);
   }
-
   console.log(`端口 ${port} 已释放。`);
 }
 
 async function killPortOnUnix(port) {
   const output = await capture("lsof", ["-ti", `tcp:${port}`, "-sTCP:LISTEN"], { allowFailure: true });
-  const pids = output
-    .split(/\r?\n/)
-    .map((line) => line.trim())
-    .filter(Boolean);
+  const pids = output.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
 
   if (pids.length === 0) {
     console.log(`端口 ${port} 没有监听进程。`);
@@ -362,7 +337,6 @@ async function killPortOnUnix(port) {
     console.log(`释放端口 ${port}: 结束 PID ${pid}`);
     await run("kill", ["-9", pid]);
   }
-
   console.log(`端口 ${port} 已释放。`);
 }
 
@@ -376,6 +350,26 @@ function addressUsesPort(address, port) {
   return address.endsWith(`:${port}`);
 }
 
+function run(command, args, options = {}) {
+  return new Promise((resolvePromise, reject) => {
+    console.log(`> ${command} ${args.join(" ")}`);
+    const child = spawn(command, args, {
+      cwd: options.cwd ?? process.cwd(),
+      stdio: "inherit",
+      shell: false
+    });
+
+    child.on("error", reject);
+    child.on("exit", (code) => {
+      if (code === 0 || options.allowFailure) {
+        resolvePromise();
+        return;
+      }
+      reject(new Error(`命令退出码 ${code}: ${command} ${args.join(" ")}`));
+    });
+  });
+}
+
 function capture(command, args, options = {}) {
   return new Promise((resolvePromise, reject) => {
     const child = spawn(command, args, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wangzhanpeng996/wzp",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Personal CLI toolbox for Gitee project creation and other WZP workflows.",
   "type": "module",
   "bin": {