done-coding-git 0.5.5-alpha.1 → 0.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "done-coding-git",
-  "version": "0.5.5-alpha.1",
+  "version": "0.6.0",
   "description": "git跨平台操作命令行工具",
   "private": false,
   "module": "es/index.mjs",
@@ -28,7 +28,6 @@
     "lib",
     "types"
   ],
-  "scripts": {},
   "repository": {
     "type": "git",
     "url": "https://gitee.com/justsosu/done-coding-cli.git",
@@ -42,7 +41,7 @@
   "license": "MIT",
   "sideEffects": false,
   "devDependencies": {
-    "@done-coding/cli-inject": "^0.5.8-alpha.0",
+    "@done-coding/cli-inject": "^0.5.8",
     "@types/node": "^18.0.0",
     "@types/yargs": "^17.0.28",
     "rimraf": "^6.0.1",
@@ -54,9 +53,10 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@done-coding/cli-utils": "^0.6.0-alpha.0",
+    "@done-coding/cli-utils": "^0.7.0",
     "@done-coding/request-axios": "^1.1.1",
     "axios": "^1.8.4"
   },
-  "gitHead": "5879161383e32e7bed351d71d3ef607d81dc021a"
+  "gitHead": "b4fb4f2380a14f72597a1dbfd1bbce22287ef02f",
+  "scripts": {}
 }

package/types/config/index.d.ts

@@ -0,0 +1,3 @@
+import { type GitConfig } from '../types';
+declare const config: GitConfig;
+export default config;

package/types/handlers/check.d.ts

@@ -0,0 +1,51 @@
+import type { CheckOptions, GitConfig } from '../types';
+import { CheckReverseMergeWayEnum } from '../types';
+import type { ArgumentsCamelCase, GitRebaseInfo, SubCliInfo, SupportGetCommitByHookName, YargsOptions } from "@done-coding/cli-utils";
+import type { PositionalOptions } from "yargs";
+export declare const getOptions: () => Record<string, YargsOptions>;
+export declare const getPositionals: () => Record<string, PositionalOptions>;
+/** 检测反向合并-通过git reflog action */
+export declare const checkReverseMergeByReflogAction: ({ config, currentBranch, }: {
+    config: GitConfig;
+    currentBranch?: string | undefined;
+}) => undefined;
+/** 检测反向合并-通过提交信息 */
+export declare const checkReverseMergeByCommitMsg: ({ config, currentBranch, commitMsg, rootDir, }: {
+    config: GitConfig;
+    currentBranch?: string | undefined;
+    commitMsg?: string | undefined;
+    rootDir: string;
+}) => void;
+/** 检测反向合并-通过提交记录 */
+export declare const checkReverseMergeByCommitRecord: ({ config, currentBranch, }: {
+    config: GitConfig;
+    currentBranch?: string | undefined;
+}) => void;
+/** 检测反向变基 */
+export declare const checkReverseRebase: ({ config, rebaseInfo, }: {
+    config: GitConfig;
+    rebaseInfo: GitRebaseInfo;
+}) => undefined;
+export type CheckReverseMergeHandlerParams = {
+    config: GitConfig;
+    rootDir: string;
+    way: CheckReverseMergeWayEnum.COMMIT_MSG;
+    hookName: SupportGetCommitByHookName;
+} | {
+    config: GitConfig;
+    rootDir: string;
+    way: CheckReverseMergeWayEnum.REFLOG_ACTION;
+} | {
+    config: GitConfig;
+    rootDir: string;
+    way: CheckReverseMergeWayEnum.COMMIT_RECORD;
+} | {
+    config: GitConfig;
+    way: CheckReverseMergeWayEnum.PRE_REBASE;
+    args: string[];
+};
+/** 检测反向合并 */
+export declare const checkReverseMergeHandler: (params: CheckReverseMergeHandlerParams) => Promise<void>;
+/** 检测 */
+export declare const handler: (argv: ArgumentsCamelCase<CheckOptions>) => Promise<void>;
+export declare const commandCliInfo: SubCliInfo;

package/types/handlers/clone.d.ts

@@ -0,0 +1,8 @@
+import type { CliHandlerArgv, CliInfo, SubCliInfo } from "@done-coding/cli-utils";
+import type { CloneOptions } from '../types';
+export declare const getOptions: () => CliInfo["options"];
+/** 位置参数 */
+export declare const getPositionals: () => CliInfo["positionals"];
+/** 克隆目标仓库 */
+export declare const handler: (options: CliHandlerArgv<CloneOptions>) => Promise<void>;
+export declare const commandCliInfo: SubCliInfo;

package/types/handlers/hooks.d.ts

@@ -0,0 +1,7 @@
+import type { ArgumentsCamelCase, PositionalOptions } from "yargs";
+import { type HooksOptions } from '../types';
+import type { SubCliInfo, YargsOptions } from "@done-coding/cli-utils";
+export declare const getOptions: () => Record<string, YargsOptions>;
+export declare const getPositionals: () => Record<string, PositionalOptions>;
+export declare const handler: (argv: ArgumentsCamelCase<HooksOptions>) => Promise<void>;
+export declare const commandCliInfo: SubCliInfo;

package/types/handlers/index.d.ts

@@ -0,0 +1,9 @@
+import { handler as initHandler, commandCliInfo as initCommandCliInfo } from "./init";
+import { handler as cloneHandler, commandCliInfo as cloneCommandCliInfo } from "./clone";
+import { handler as hooksHandler, commandCliInfo as hooksCommandCliInfo } from "./hooks";
+import { handler as checkHandler, commandCliInfo as checkCommandCliInfo } from "./check";
+import { SubcommandEnum } from '../types';
+import { type CliHandlerArgv, type CliInfo } from "@done-coding/cli-utils";
+export { initHandler, initCommandCliInfo, cloneHandler, cloneCommandCliInfo, hooksHandler, hooksCommandCliInfo, checkHandler, checkCommandCliInfo, };
+export declare const handler: (command: SubcommandEnum, argv: CliHandlerArgv<any>) => Promise<void>;
+export declare const commandCliInfo: Omit<CliInfo, "usage">;

package/types/handlers/init.d.ts

@@ -0,0 +1,19 @@
+/// <reference types="yargs" />
+import type { ArgumentsCamelCase, SubCliInfo } from "@done-coding/cli-utils";
+import { InitTypeEnum, type InitOptions } from '../types';
+/** 获取初始化选项 */
+export declare const getOptions: () => {
+    type: {
+        alias: string;
+        describe: string;
+        choices: InitTypeEnum[];
+        default: InitTypeEnum;
+    };
+    rootDir: import("yargs").Options;
+    configPath: import("yargs").Options;
+};
+export declare const handler: (argv: ArgumentsCamelCase<InitOptions> & {
+    /** 是否是子命令 */
+    isSubCommand?: boolean;
+}) => Promise<void>;
+export declare const commandCliInfo: SubCliInfo;

package/types/index.d.ts

@@ -1,3 +1,3 @@
-export { handler } from "./handler";
+export * from './handlers';
 export { crateAsSubcommand } from "./main";
-export { getTargetRepoUrl, cloneHandler } from "./utils";
+export { getTargetRepoUrl } from "./utils";

package/types/injectInfo.json.d.ts

@@ -1,6 +1,6 @@
 declare const _default: {
   "name": "@done-coding/cli-git",
-  "version": "0.5.5-alpha.1",
+  "version": "0.6.0",
   "description": "git跨平台操作命令行工具",
   "cliConfig": {
     "namespaceDir": ".done-coding",

package/types/types/check.d.ts

@@ -0,0 +1,40 @@
+import { ReadConfigFileOptions } from "@done-coding/cli-utils";
+import { SubcommandEnum } from "./subcommand";
+/** 检测类型 */
+export declare enum CheckTypeEnum {
+    /** 反向提交 */
+    REVERSE_MERGE = "reverseMerge"
+}
+/** 检测反向方式枚举 */
+export declare enum CheckReverseMergeWayEnum {
+    /** GIT_REFLOG_ACTION */
+    REFLOG_ACTION = "reflog-action",
+    /** 提交信息 */
+    COMMIT_MSG = "commit-msg",
+    /** 提交记录 */
+    COMMIT_RECORD = "commit-record",
+    /** 变基线 */
+    PRE_REBASE = "pre-rebase"
+}
+/** 检测反向 */
+export type CheckOptions = ReadConfigFileOptions & {
+    type: CheckTypeEnum;
+    args: string[];
+};
+/**
+ * 禁止合并某个分支的检测选项
+ */
+export interface GitConfigCheckReverseMergeBranchConfig {
+    /** 包括变基操作 */
+    includeRebase: boolean;
+    /** 某个hash之后的提交 */
+    afterHash?: string;
+    /** 最多(检查日志数量) */
+    logCount: number;
+}
+/** 螃蟹git配置 */
+export interface GitConfig {
+    [SubcommandEnum.CHECK]: {
+        [CheckTypeEnum.REVERSE_MERGE]: Record<string, GitConfigCheckReverseMergeBranchConfig>;
+    };
+}

package/types/{utils/types.d.ts → types/clone.d.ts}

@@ -1,13 +1,3 @@
-import type { InitConfigFileOptions } from "@done-coding/cli-utils";
-/** 子命令枚举 */
-export declare enum SubcommandEnum {
-    /** 初始化配置文件 */
-    INIT = "init",
-    /** 克隆 */
-    CLONE = "clone"
-}
-/** 初始化选项 */
-export type InitOptions = Pick<InitConfigFileOptions, "rootDir">;
 /** Git 平台枚举 */
 export declare enum GitPlatformEnum {
     /** GitHub */

package/types/types/hooks.d.ts

@@ -0,0 +1,5 @@
+import { HooksNameEnum, ReadConfigFileOptions } from "@done-coding/cli-utils";
+/** hooks选项 */
+export type HooksOptions = ReadConfigFileOptions & {
+    name: HooksNameEnum;
+};

package/types/types/index.d.ts

@@ -0,0 +1,5 @@
+export * from "./subcommand";
+export * from "./init";
+export * from "./clone";
+export * from "./hooks";
+export * from "./check";

package/types/types/init.d.ts

@@ -0,0 +1,10 @@
+import type { InitConfigFileOptions } from "@done-coding/cli-utils";
+/** 初始化类型 */
+export declare enum InitTypeEnum {
+    DEFAULT = "default",
+    CLONE_CONFIG = "cloneConfig"
+}
+/** 初始化选项 */
+export interface InitOptions extends InitConfigFileOptions {
+    type?: InitTypeEnum;
+}

package/types/types/subcommand.d.ts

@@ -0,0 +1,13 @@
+/** 子命令枚举 */
+export declare enum SubcommandEnum {
+    /** 初始化配置文件 */
+    INIT = "init",
+    /** 克隆 */
+    CLONE = "clone",
+    /** hooks调用 */
+    HOOKS = "hooks",
+    /**
+     * 检测
+     */
+    CHECK = "check"
+}

package/types/utils/check.d.ts

@@ -0,0 +1,20 @@
+import type { GitConfig } from '../types';
+import type { GitLogItemInfo, GitReflogItemInfo } from "@done-coding/cli-utils";
+import { type GitMergeBranchInfo } from "@done-coding/cli-utils";
+/** 获取检测反向合并配置map */
+export declare const getCheckReverseMergeConfigMap: (config: GitConfig) => Record<string, import('../types').GitConfigCheckReverseMergeBranchConfig>;
+/** 获取检测反向合并配置map类型 */
+export type CheckReverseMergeConfigMap = ReturnType<typeof getCheckReverseMergeConfigMap>;
+/** 获取检测反向合并配置的最大日志数量 */
+export declare const getCheckReverseMergeMaxLogCount: (configMap: CheckReverseMergeConfigMap) => number;
+/** 获取检测反向合并配置的最大索引map */
+export declare const getCheckReverseMergeMaxIndexMap: (configMap: CheckReverseMergeConfigMap, logList: (GitLogItemInfo | GitReflogItemInfo)[]) => Record<string, number>;
+/**
+ * 检测是否是反向合并
+ *
+ */
+export declare const checkIsReverseMerge: ({ mergeInfo, configMap, currentBranch, }: {
+    mergeInfo?: GitMergeBranchInfo | undefined;
+    configMap: CheckReverseMergeConfigMap;
+    currentBranch?: string | undefined;
+}) => boolean | undefined;

package/types/utils/config.d.ts

@@ -1,4 +1,4 @@
-import type { GitConfigInfo, GitParamsInfo } from "./types";
+import type { GitConfigInfo, GitParamsInfo } from '../types';
 /**
  * 获取配置信息
  */

package/types/utils/get-repo.d.ts

@@ -1,3 +1,3 @@
-import { type GitParamsInfo } from "./types";
+import { type GitParamsInfo } from '../types';
 /** 获取目标仓库地址 */
 export declare const getTargetRepoUrl: ({ platform: platformInit, username: usernameInit, }?: Partial<GitParamsInfo>) => Promise<any>;

package/types/utils/hooks.d.ts

@@ -0,0 +1,7 @@
+import { HooksNameEnum } from "@done-coding/cli-utils";
+/** 支持的git hooks名称 */
+export declare const SUPPORT_HOOKS_NAME: HooksNameEnum[];
+/** 支持的检查反向合并的git hooks名称 */
+export declare const SUPPORT_CHECK_REVERSE_MERGE_HOOKS_NAME: readonly [HooksNameEnum.PRE_MERGE_COMMIT, HooksNameEnum.PREPARE_COMMIT_MSG, HooksNameEnum.POST_MERGE, HooksNameEnum.PRE_PUSH, HooksNameEnum.PRE_REBASE];
+/** 支持的检查反向合并的git hooks名称类型 */
+export type SupportCheckReverseMergeHooksNameType = (typeof SUPPORT_CHECK_REVERSE_MERGE_HOOKS_NAME)[number];

package/types/utils/index.d.ts

@@ -1,7 +1,6 @@
-export * from "./types";
 export * from "./get-repo";
-export * from "./init";
-export * from "./clone";
 export * from "./path";
 export * from "./config";
 export * from "./question";
+export * from "./hooks";
+export * from "./check";

package/types/utils/path.d.ts

@@ -1,2 +1,4 @@
 /** 模块配置相对路径 */
 export declare const MODULE_CONFIG_RELATIVE_PATH: string;
+/** 模块默认配置文件相对路径 */
+export declare const MODULE_DEFAULT_CONFIG_RELATIVE_PATH: string;

package/types/utils/question.d.ts

@@ -1,5 +1,5 @@
 import type { PromptObject } from "@done-coding/cli-utils";
-import { GitPlatformEnum } from "./types";
+import { GitPlatformEnum } from '../types';
 /** git平台选择表单 */
 export declare const getPlatformForm: (initialValue?: GitPlatformEnum) => PromptObject<string>;
 /** git用户名表单 */

package/es/clone-11819b7f.js

@@ -1,222 +0,0 @@
-#!/usr/bin/env node
-import { createRequest as $ } from "@done-coding/request-axios";
-import C from "axios";
-import { lookForParentTarget as S, log as a, decryptAES as I, encryptAES as P, xPrompts as m } from "@done-coding/cli-utils";
-import f from "node:fs";
-import d from "node:path";
-import { execSync as k } from "node:child_process";
-var v = /* @__PURE__ */ ((e) => (e.INIT = "init", e.CLONE = "clone", e))(v || {}), l = /* @__PURE__ */ ((e) => (e.GITHUB = "github", e.GITEE = "gitee", e))(l || {});
-const w = 3e4, h = Math.random(), G = {
-  timeout: w,
-  getBusinessCode() {
-    return h;
-  },
-  getBusinessMsg(e) {
-    return e.statusText;
-  },
-  getBusinessData(e) {
-    return e.data;
-  },
-  businessSuccessCodeList: [h],
-  axios: C
-}, y = $({
-  basePath: " https://gitee.com",
-  ...G
-}), U = $({
-  basePath: "https://api.github.com",
-  ...G
-}), B = ({
-  username: e
-}) => y({
-  url: `/api/v5/users/${e}/repos`,
-  method: "GET"
-}), F = ({
-  accessToken: e
-}) => y({
-  url: "/api/v5/user/repos",
-  method: "GET",
-  params: {
-    access_token: e,
-    per_page: 100,
-    page: 1,
-    sort: "updated"
-  }
-}), _ = ({
-  username: e
-}) => U({
-  url: `/users/${e}/repos`,
-  method: "GET"
-}), x = ({
-  accessToken: e
-}) => U({
-  url: "/user/repos",
-  method: "GET",
-  headers: {
-    Authorization: `Bearer ${e}`
-  },
-  params: {
-    per_page: 100,
-    page: 1,
-    sort: "updated"
-  }
-}), N = {
-  name: "@done-coding/cli-git",
-  version: "0.5.5-alpha.1",
-  description: "git跨平台操作命令行工具",
-  cliConfig: {
-    namespaceDir: ".done-coding",
-    moduleName: "git"
-  }
-}, {
-  cliConfig: { namespaceDir: O, moduleName: R }
-} = N, A = `./${O}/${R}`, E = (e) => `${A}/.${e}`, b = ({ platform: e, username: t }) => `${e}/${t}`, D = (e) => {
-  const { platform: t } = e, s = E(t), n = S(s, {
-    isFindFarthest: !1
-  });
-  if (!n) {
-    a.warn("配置文件不存在");
-    return;
-  }
-  const o = `${n}/${s}`, c = f.readFileSync(o, "utf-8"), i = b(e), u = I({ encryptedText: c, secretKey: i });
-  if (!u) {
-    a.warn("配置文件解密失败");
-    return;
-  }
-  return JSON.parse(u);
-}, V = ({
-  rootDir: e,
-  username: t,
-  platform: s,
-  accessToken: n
-}) => {
-  const o = E(s), i = JSON.stringify({
-    accessToken: n
-  }), u = b({ platform: s, username: t }), p = P({ text: i, secretKey: u }), g = d.join(e, o);
-  f.mkdirSync(d.dirname(g), {
-    recursive: !0
-  }), f.writeFileSync(g, p, "utf-8"), a.success(`配置信息保存成功 ${g}`);
-}, T = [
-  { title: "GitHub", value: l.GITHUB },
-  { title: "Gitee", value: l.GITEE }
-], H = (e) => {
-  let t = 0;
-  if (e) {
-    const s = T.findIndex(
-      (n) => n.value === e
-    );
-    s >= 0 && (t = s);
-  }
-  return {
-    type: "select",
-    name: "platform",
-    message: "选择git平台",
-    choices: T,
-    initial: t
-  };
-}, j = (e) => ({
-  type: "text",
-  name: "username",
-  message: "请输入用户名",
-  format: (t) => t.trim(),
-  validate: (t) => t.length > 0 || "用户名不能为空",
-  initial: e
-}), W = {
-  type: "password",
-  name: "accessToken",
-  message: "请输入git access token",
-  format: (e) => e.trim(),
-  validate: (e) => e.length > 0 || "access token不能为空"
-}, L = async ({
-  platform: e,
-  username: t
-} = {}) => {
-  const s = {
-    platform: e,
-    username: t
-  };
-  e || (s.platform = (await m(H())).platform), t || (s.username = (await m(j())).username);
-  const { platform: n, username: o } = s;
-  let c = [];
-  const i = D({
-    username: o,
-    platform: n
-  });
-  let u = i == null ? void 0 : i.accessToken;
-  a.stage(`正在获取${o}的${n}仓库列表...`);
-  const p = {
-    username: o,
-    accessToken: u
-  };
-  switch (s.platform) {
-    case l.GITHUB: {
-      c = (await (p.accessToken ? x : _)(p)).data.map((r) => ({
-        name: r.name,
-        httpUrl: r.clone_url,
-        sshUrl: r.ssh_url,
-        description: r.description || ""
-      }));
-      break;
-    }
-    case l.GITEE: {
-      c = (await (p.accessToken ? F : B)(p)).data.map((r) => ({
-        name: r.name,
-        httpUrl: r.html_url,
-        sshUrl: r.ssh_url,
-        description: r.description || ""
-      }));
-      break;
-    }
-    default:
-      return a.error(`未知平台${n}`), process.exit(1);
-  }
-  if (a.success(`获取${o}的${n}仓库列表成功`), c.length === 0) {
-    a.warn(`${o} 可获取${n}仓库列表为空`);
-    return;
-  } else
-    a.stage(`共${c.length}个仓库`);
-  const { repoUrl: g } = await m({
-    name: "repoUrl",
-    type: "select",
-    message: "选择仓库",
-    choices: c.map((r) => ({
-      title: `${r.name} ${r.description}`,
-      value: r.sshUrl
-    }))
-  });
-  return g;
-}, X = () => ({
-  projectName: {
-    type: "string",
-    alias: "p",
-    describe: "项目名称"
-  }
-}), Y = () => ({
-  platform: {
-    describe: "选择git平台",
-    type: "string",
-    choices: [l.GITHUB, l.GITEE]
-  },
-  username: {
-    describe: "git平台用户名",
-    type: "string"
-  }
-}), Z = async (e) => {
-  const t = await L(e), { projectName: s } = e;
-  k(
-    `git clone ${t} ${s ? `${s} ` : ""}--depth=1`,
-    { stdio: "inherit" }
-  ), a.success(`克隆${t}成功`);
-};
-export {
-  l as G,
-  v as S,
-  j as a,
-  W as b,
-  Z as c,
-  X as d,
-  Y as e,
-  L as f,
-  H as g,
-  N as i,
-  V as s
-};

package/es/index-49e07bde.js

@@ -1,60 +0,0 @@
-#!/usr/bin/env node
-import { getRootDirOptions as p, xPrompts as e, log as C, _curry as r, createSubcommand as c, createMainCommand as f } from "@done-coding/cli-utils";
-import { g, a as I, b, s as h, S as t, c as N, d as O, e as w, i as T } from "./clone-11819b7f.js";
-import $ from "node:os";
-const y = () => p($.homedir()), E = async (o) => {
-  const { rootDir: n } = o, { platform: s } = await e(g()), { username: l } = await e(I()), { accessToken: u } = await e(b);
-  await h({
-    rootDir: n,
-    platform: s,
-    username: l,
-    accessToken: u
-  });
-}, i = async (o, n) => {
-  switch (o) {
-    case t.INIT:
-      return E(n);
-    case t.CLONE:
-      return N(n);
-    default:
-      return C.error(`无效的命令: ${o}`), process.exit(1);
-  }
-}, {
-  version: x,
-  description: A,
-  cliConfig: { moduleName: a }
-} = T, F = {
-  command: t.INIT,
-  describe: "初始化git配置文件",
-  options: y(),
-  handler: r(i)(
-    t.INIT
-  )
-}, L = {
-  command: `${t.CLONE} <platform> <username>`,
-  describe: "从选择的git平台克隆代码",
-  options: O(),
-  positionals: w(),
-  handler: r(i)(
-    t.CLONE
-  )
-}, m = {
-  describe: A,
-  version: x,
-  subcommands: [F, L].map(c),
-  demandCommandCount: 1
-}, d = (o = !1) => {
-  const n = o ? a : void 0, s = `$0${o ? ` ${a}` : ""} <command> [options]`;
-  return { command: n, usage: s };
-}, v = async () => f({
-  ...m,
-  ...d()
-}), D = () => c({
-  ...m,
-  ...d(!0)
-});
-export {
-  D as a,
-  v as c,
-  i as h
-};

package/types/handler.d.ts

@@ -1,5 +0,0 @@
-import { SubcommandEnum } from './utils';
-import type { InitOptions, CloneOptions } from './utils';
-import type { CliHandlerArgv } from "@done-coding/cli-utils";
-/** 子命令处理函数 */
-export declare const handler: (command: SubcommandEnum, argv: CliHandlerArgv<InitOptions | CloneOptions>) => Promise<void>;

package/types/utils/clone.d.ts

@@ -1,7 +0,0 @@
-import { type CloneOptions } from "./types";
-import type { CliInfo } from "@done-coding/cli-utils";
-export declare const getCloneOptions: () => CliInfo["options"];
-/** 获取克隆命令的位置参数 */
-export declare const getClonePositionals: () => CliInfo["positionals"];
-/** 克隆目标仓库 */
-export declare const cloneHandler: (options: CloneOptions) => Promise<void>;

package/types/utils/init.d.ts

@@ -1,9 +0,0 @@
-/// <reference types="yargs" />
-import type { CliHandlerArgv } from "@done-coding/cli-utils";
-import type { InitOptions } from "./types";
-/** 获取初始化选项 */
-export declare const getInitOptions: () => {
-    rootDir: import("yargs").Options;
-};
-/** 初始化命令处理器 */
-export declare const initHandler: (argv: CliHandlerArgv<InitOptions>) => Promise<void>;