✨ refactor(feature): 调整 gituser api

Author: OSpoon

api-model/api-gituser.ts

@@ -1,7 +1,8 @@
 import {
   setGitUserName,
   setGitUserEmail,
-  checkGitUserInfo,
+  checkGitUserName,
+  checkGitUserEmail,
 } from "../src/index";
 
 (async () => {
@@ -10,5 +11,6 @@ import {
     "zxin088@gmail.com",
     "^[a-zA-Z0-9._%+-]+@(gmail)\\.(com)$"
   );
-  await checkGitUserInfo("[\\s\\S]*", "^[a-zA-Z0-9._%+-]+@(gmail)\\.(com)$");
+  await checkGitUserName("[\\s\\S]*");
+  await checkGitUserEmail("^[a-zA-Z0-9._%+-]+@(gmail)\\.(com)$");
 })();

scripts/lint-script.ts

@@ -1,10 +1,10 @@
 import { eslintFix } from "@/command/eslint-fix";
-import { checkGitUserInfo } from "@/command/git-user";
+import { checkGitUserEmail } from "@/command/git-user";
 import { prettierFormat } from "@/command/prettier-format";
 import { execCommand } from "@/helper";
 
 async function lint() {
-  await checkGitUserInfo("[\\s\\S]*", "^[a-zA-Z0-9._%+-]+@(gmail)\\.(com)$");
+  await checkGitUserEmail("^[a-zA-Z0-9._%+-]+@(gmail)\\.(com)$");
   await prettierFormat(["./src/", "./scripts/"]);
   await execCommand("git", ["add", "."]);
   await eslintFix(["./src/", "./scripts/"]);

src/command/git-user.ts

@@ -51,22 +51,31 @@ export async function setGitUserEmail(email: string, ruleEmail: string) {
   }
 }
 
-export async function checkGitUserInfo(ruleName: string, ruleEmail: string) {
+export async function checkGitUserName(ruleName: string) {
   if (ACTIVATION) {
     loggerInfo(
       `checkGitUserInfo 参数信息: \n ${JSON.stringify({
         ruleName,
-        ruleEmail,
       })}`,
     );
   }
   const nameRegExp = new RegExp(ruleName!);
-  const emailRegExp = new RegExp(ruleEmail!, "i");
   const username = await execCommand("git", ["config", "user.name"]);
   if (!nameRegExp.test(username)) {
     printError(`${username} 不符合 ${ruleName} 规范`);
     process.exit(1);
   }
+}
+
+export async function checkGitUserEmail(ruleEmail: string) {
+  if (ACTIVATION) {
+    loggerInfo(
+      `checkGitUserInfo 参数信息: \n ${JSON.stringify({
+        ruleEmail,
+      })}`,
+    );
+  }
+  const emailRegExp = new RegExp(ruleEmail!, "i");
   const useremail = await execCommand("git", ["config", "user.email"]);
   if (!emailRegExp.test(useremail)) {
     printError(`${useremail} 不符合 ${ruleEmail} 规范`);
@@ -95,10 +104,10 @@ export default function gitUserInstaller(cli: CAC) {
           },
         )
         .action(async (options) => {
-          console.log(options);
           const { name, email, ruleName, ruleEmail } = options;
           if (!name && !email) {
-            await checkGitUserInfo(ruleName, ruleEmail);
+            await checkGitUserName(ruleName);
+            await checkGitUserEmail(ruleEmail);
           }
           if (name) {
             await setGitUserName(name, ruleName);

src/index.ts

@@ -21,7 +21,8 @@ import lighthouseInstaller, { lighthouse } from "@/command/lighthouse";
 import gitUserInstaller, {
   setGitUserName,
   setGitUserEmail,
-  checkGitUserInfo,
+  checkGitUserName,
+  checkGitUserEmail,
 } from "@/command/git-user";
 import quantityInstaller, { quantity } from "@/command/quantity";
 import { defineConfig } from "@/helper";
@@ -41,7 +42,8 @@ export {
   lighthouse,
   setGitUserName,
   setGitUserEmail,
-  checkGitUserInfo,
+  checkGitUserName,
+  checkGitUserEmail,
   quantity,
 };