Merge branch 'refactor-dir' into dev

Author: wh131462

.gitignore

@@ -24,4 +24,7 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
-coverage/**
+coverage/**
+
+# store file
+resources/stores/*

Readme.md

@@ -71,8 +71,8 @@ yarn leet-create
 
 会通过接口获取今日题目，并会在`src`目录下根据`题目的id`+`题目的英文翻译`创建一个目录，并将今日题目和基础示例代码填充到`index.js`中。
 
-![创建目录](./resources/leet-create-0.png)
-![填充文件](resources/leet-create-1.png)
+![创建目录](resources/images/leet-create-0.png)
+![填充文件](resources/images/leet-create-1.png)
 
 ### 2. 检验今天的题目
 
@@ -102,7 +102,7 @@ Done in 0.18s.
 
 ```
 
-![检测题目](resources/leet-check.png)
+![检测题目](resources/images/leet-check.png)
 
 ### 3. 创建自己想要练习的题目
 
@@ -125,9 +125,9 @@ yarn leet-create -i "LCP 29"
   └── index.js # 模板js文件 可以替换题目
 ```
 
-![1314cmd.png](resources/1314-cmd.png)
-![1314.png](resources/1314.png)
-![1314详情.png](resources/1314-detail.png)
+![1314cmd.png](resources/images/1314-cmd.png)
+![1314.png](resources/images/1314.png)
+![1314详情.png](resources/images/1314-detail.png)
 
 ### 4. 检验自己想要练习的结果
 
@@ -179,7 +179,7 @@ Done in 0.19s.
 
 ```
 
-![1314-check.png](resources/1314-check.png)
+![1314-check.png](resources/images/1314-check.png)
 
 ### 5. 获取随机题目
 
@@ -237,5 +237,6 @@ Done in 0.19s.
 
 ## Contributor
 
-[EternalHeart](https://github.com/wh131462)
-[SmallTeddy](https://github.com/SmallTeddy)
+[<img src="https://avatars.githubusercontent.com/u/48346853" style="border-radius:50%;" width="30" height="30" alt="EternalHeart"/>](https://github.com/wh131462)
+[<img src="https://avatars.githubusercontent.com/u/61453917" style="border-radius:50%;" width="30" height="30" alt="SmartTeddy"/>](https://github.com/SmallTeddy)
+[<img src="https://avatars.githubusercontent.com/u/35305691" style="border-radius:50%;" width="30" height="30" alt="Hedwig-Fang"/>](https://github.com/Hedwig-Fang)

bin/lc.js

@@ -1,48 +1,43 @@
 #! /usr/bin/env node
 import {program} from "commander";
+import {artFontLogo} from "../resources/text/art-font-logo.js";
+import {examples} from "../resources/text/examples.js";
+import {love} from "../resources/text/love.js";
+import {aim} from "../resources/text/aim.js";
+import {referMode} from "#common/utils/create-check/refer-mode.js";
+import {getArgs} from "#common/utils/create-check/get-args.js";
+import fs from "fs";
+const {version} =  JSON.parse(fs.readFileSync("package.json",'utf-8'));
 
 program
-    .version('1.0.0')
-    .description(`                                                                                                                                                                                  
-
-░▒▓█▓▒░      ░▒▓████████▓▒░▒▓████████▓▒░▒▓████████▓▒░▒▓██████▓▒░ ░▒▓██████▓▒░░▒▓███████▓▒░░▒▓████████▓▒░      ░▒▓███████▓▒░░▒▓███████▓▒░ ░▒▓██████▓▒░ ░▒▓██████▓▒░▒▓████████▓▒░▒▓█▓▒░░▒▓██████▓▒░░▒▓████████▓▒░ 
-░▒▓█▓▒░      ░▒▓█▓▒░      ░▒▓█▓▒░         ░▒▓█▓▒░  ░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░             ░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▒░   ░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░        
-░▒▓█▓▒░      ░▒▓█▓▒░      ░▒▓█▓▒░         ░▒▓█▓▒░  ░▒▓█▓▒░      ░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░             ░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░        ░▒▓█▓▒░   ░▒▓█▓▒░▒▓█▓▒░      ░▒▓█▓▒░        
-░▒▓█▓▒░      ░▒▓██████▓▒░ ░▒▓██████▓▒░    ░▒▓█▓▒░  ░▒▓█▓▒░      ░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓██████▓▒░        ░▒▓███████▓▒░░▒▓███████▓▒░░▒▓████████▓▒░▒▓█▓▒░        ░▒▓█▓▒░   ░▒▓█▓▒░▒▓█▓▒░      ░▒▓██████▓▒░   
-░▒▓█▓▒░      ░▒▓█▓▒░      ░▒▓█▓▒░         ░▒▓█▓▒░  ░▒▓█▓▒░      ░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░             ░▒▓█▓▒░      ░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░        ░▒▓█▓▒░   ░▒▓█▓▒░▒▓█▓▒░      ░▒▓█▓▒░        
-░▒▓█▓▒░      ░▒▓█▓▒░      ░▒▓█▓▒░         ░▒▓█▓▒░  ░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░             ░▒▓█▓▒░      ░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░ ░▒▓█▓▒░   ░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░        
-░▒▓████████▓▒░▒▓████████▓▒░▒▓████████▓▒░  ░▒▓█▓▒░   ░▒▓██████▓▒░ ░▒▓██████▓▒░░▒▓███████▓▒░░▒▓████████▓▒░      ░▒▓█▓▒░      ░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░░▒▓██████▓▒░  ░▒▓█▓▒░   ░▒▓█▓▒░░▒▓██████▓▒░░▒▓████████▓▒░ 
-                                                                                                                                                                                                                
-                                                                                                                                                                                                                
-LeetCode Practice CLI`)
-    .argument('<string>', 'Default to get this identity.')
+    .version(version)
+    .description(`${artFontLogo}\n${aim}`)
+    .addHelpText('after', examples+love)
+    .arguments("[identity]")
     .option('-i, --identity <identity>', 'Specify a question by identity.')
     .option('-r, --random', 'Get a question randomly.')
     .option('-t, --today', 'Get a question today.')
-    .parse(process.argv);
-// program.
-//     examples(`
-//   $ lc
-//   $ lc 1314
-//   $ lc -i 1314
-//   $ lc -r
-//   $ lc -t
-// `)
-const args = program.args;
-const opts = program.opts();
-console.log("[args]",args)
-console.log("[opts]",opts)
-
-const getCase = (args,opts)=>{
-    return 'today'
-}
+    .parse(process.argv)
 
-const rules = {
-    'today':(args,opts)=>{},
-    'random':(args,opts)=>{},
-    'identity':(args,opts)=>{},
+const cmdArgs = program.args;
+const cmdOpts = program.opts();
+// 模式对应的action
+const callModeAction = {
+    'today': () => {
+        // todo 获取今日题目的进程
+        console.log("[leetcode-practice] 获取今日题目")
+    },
+    'random': () => {
+        // todo 获取随机题目的进程
+        console.log("[leetcode-practice] 获取随机题目")
+    },
+    'identity': (id) => {
+        // todo 获取指定题目的进程
+        console.log(`[leetcode-practice] 获取指定题目[${id}]`)
+    },
 }
-
+// 获取模式和参数
+const mode = referMode(cmdArgs, cmdOpts);
+const args = getArgs(mode,cmdArgs,cmdOpts);
 // 执行指令分发
-const current = getCase(args,opts);
-rules[current](args,opts);
+callModeAction[mode](args);

bin/lf.js

@@ -1,6 +1,43 @@
 #! /usr/bin/env node
-const init = async() => {
-  await import('../common/scripts/check.js');
- 
- }
- init()
+import {program} from "commander";
+import {artFontLogo} from "../resources/text/art-font-logo.js";
+import {examples} from "../resources/text/examples.js";
+import {love} from "../resources/text/love.js";
+import {aim} from "../resources/text/aim.js";
+import {referMode} from "#common/utils/create-check/refer-mode.js";
+import {getArgs} from "#common/utils/create-check/get-args.js";
+import fs from "fs";
+const {version} =  JSON.parse(fs.readFileSync("package.json",'utf-8'));
+
+program
+    .version(version)
+    .description(`${artFontLogo}\n${aim}`)
+    .addHelpText('after', examples+love)
+    .arguments("[identity]")
+    .option('-i, --identity <identity>', 'Check the specified question by identity.')
+    .option('-r, --random', 'Check the last random question.')
+    .option('-t, --today', 'Check the question today.')
+    .parse(process.argv)
+
+const cmdArgs = program.args;
+const cmdOpts = program.opts();
+// 模式对应的action
+const callModeAction = {
+    'today': () => {
+        // todo 获取今日题目的进程
+        console.log("[leetcode-practice] 检测今日题目")
+    },
+    'random': () => {
+        // todo 获取随机题目的进程
+        console.log("[leetcode-practice] 检测随机题目")
+    },
+    'identity': (id) => {
+        // todo 获取指定题目的进程
+        console.log(`[leetcode-practice] 检测指定题目[${id}]`)
+    },
+}
+// 获取模式和参数
+const mode = referMode(cmdArgs, cmdOpts);
+const args = getArgs(mode,cmdArgs,cmdOpts);
+// 执行指令分发
+callModeAction[mode](args);

bin/lk.js

@@ -15,9 +15,7 @@
 | createQuestion  | newPath               | 以传入名称创建src/[newPath]/index.js 并填充模板 |
 | fulfillQuestion | questionPath,question | 在对应题目空模板中填充具体问题信息                   |
 | removeDomTags   | input                 | 从传入的html字符串中剥离html标签                |
-| readStore       | key                   | 从缓存中读取对应的键值                         |
-| writeStore      | key,value             | 从缓存中存入值（明文存储，文件为store.json）         |
-| getJsCode       | enName                | 获取JS代码                              |
+| getJsCode       | slug                | 获取JS代码                              |
 | getTestCase     | question              | 根据获取到的question信息组装测试用例              |
-| getQuestionUrl  | enName                | 简单组装问题的URL                          |
+| getQuestionUrl  | slug                | 简单组装问题的URL                          |
 | getRandomId     |                       | 获取随机当前src目录下不存在的问题id                |

common/resources/store.json

@@ -0,0 +1,11 @@
+// 获取模式对应的参数
+export const getArgs = (mode,cmdArgs,cmdOpts) => {
+    switch (mode) {
+        case "identity":
+            return cmdArgs.length ? cmdArgs.join(" ") : cmdOpts?.identity;
+        case "random":
+        case "today":
+        default:
+            return null;
+    }
+}

common/utils/Readme.md

@@ -0,0 +1,10 @@
+// 推测模式
+export const referMode = (args, opts) => {
+    if (args.length > 0 || opts.identity) {
+        return 'identity'
+    }
+    if (opts.random) {
+        return 'random'
+    }
+    return 'today';
+}