cc-codeline 1.0.5 → 1.0.7

package/README.md

@@ -2,9 +2,9 @@
 ```
 npm i -g cc-codeline
 
-codeline /path/
+codeline /path/ -l -e node_modules dist
 
 -h  Show help
 -l  Print log
--e  Exclude directory
+-e  Exclude files or directories by name
 ```

package/bin.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 const fs = require("fs").promises;
-const { extname, resolve } = require("path");
+const { extname, resolve, basename } = require("path");
 
 const languages = {
     ".js": {
@@ -27,9 +27,15 @@ const languages = {
     ".java": {
         comment: /\/\*[\s\S]+?\*\/|\/\/.*/g,
     },
+    ".go": {
+        comment: /\/\*[\s\S]+?\*\/|\/\/.*/g,
+    },
     ".rs": {
         comment: /\/\*[\s\S]+?\*\/|\/\/.*/g,
     },
+    ".zig": {
+        comment: /\/\*[\s\S]+?\*\/|\/\/.*/g,
+    },
     ".cs": {
         comment: /\/\*[\s\S]+?\*\/|\/\/.*/g,
     },
@@ -45,6 +51,9 @@ const languages = {
     ".py": {
         comment: /'''[\s\S]+?'''|#.*/g,
     },
+    ".lua": {
+        comment: /--\[\[[\s\S]+?\]\]|--.*/g,
+    }
 };
 
 const param = process.argv.slice(2);
@@ -54,7 +63,7 @@ codeline /path/ -l -e node_modules dist
 ------------------
 -h  Show help
 -l  Print log
--e  Exclude directory
+-e  Exclude files or directories by name
 		`);
     process.exit(0);
 }
@@ -68,10 +77,10 @@ const isLog = (() => {
     return false;
 })();
 
-const excludePath = (() => {
+const excludeNames = (() => {
     const index = param.findIndex((it) => it == "-e");
     if (index >= 0) {
-        return param.splice(index).map((it) => resolve(base, it));
+        return param.splice(index);
     }
 })();
 
@@ -87,7 +96,9 @@ setInterval(() => {
     console.log("...");
 }, 1000);
 
-(async () => {
+main();
+
+async function main() {
     try {
         const stat = await fs.stat(path);
         if (stat.isDirectory()) {
@@ -100,9 +111,10 @@ setInterval(() => {
             process.exit(0);
         }
     } catch (err) {
-        console.log(err.message || "Error, the path may not exist");
+        console.error(err.message || "Unknown error");
+        process.exit(0);
     }
-})();
+}
 
 function print() {
     console.table({
@@ -115,71 +127,70 @@ function print() {
 }
 
 async function readDirectory(dirPath) {
-    if (excludePath && excludePath.includes(dirPath)) {
+    if (excludeNames && excludeNames.includes(basename(dirPath))) {
         return;
     }
     let progress = 0;
-    try {
-        const filenames = await fs.readdir(dirPath);
-        if (!filenames.length) {
-            return;
-        }
-        for (let name of filenames) {
-            const filepath = resolve(dirPath, name);
-            const fileStat = await fs.stat(filepath);
-            if (fileStat.isDirectory()) {
-                await readDirectory(filepath);
-                progress += 1;
-                if (progress >= filenames.length) {
-                    return;
-                }
-            } else {
-                await readFile(filepath);
-                progress += 1;
-                if (progress >= filenames.length) {
-                    return;
-                }
+    const filenames = await fs.readdir(dirPath);
+    if (!filenames.length) {
+        return;
+    }
+    for (let name of filenames) {
+        const filepath = resolve(dirPath, name);
+        const fileStat = await fs.stat(filepath);
+        if (fileStat.isDirectory()) {
+            await readDirectory(filepath);
+            progress += 1;
+            if (progress >= filenames.length) {
+                return;
+            }
+        } else {
+            await readFile(filepath);
+            progress += 1;
+            if (progress >= filenames.length) {
+                return;
             }
         }
-    } catch (err) {
-        console.log(err.message || "Error");
     }
 }
 
 async function readFile(filepath) {
+    let removedExt = filepath.split(".");
+    removedExt.pop()
+    removedExt = removedExt.join("");
+
+    if (excludeNames && excludeNames.includes(basename(removedExt))) {
+        return;
+    }
     const fileExtname = extname(filepath);
     if (!Object.keys(languages).includes(fileExtname)) {
         return;
     }
-    try {
-        const data = await fs.readFile(filepath);
-        if (isLog) {
-            console.log(filepath);
-        }
+    const data = await fs.readFile(filepath);
+    if (isLog) {
+        console.log(filepath);
+    }
 
-        const content = data.toString();
-        fileCount += 1;
+    const content = data.toString();
+    fileCount += 1;
 
-        const reg = languages[fileExtname].comment;
-        reg.lastIndex = 0;
-        if (reg) {
-            content.match(reg)?.forEach((comm) => {
-                const res = comm.split("\n");
-                comment += res.length;
-                source -= res.length;
-            });
-        }
-        const lines = content.split("\n");
-        total += lines.length;
-        for (let line of lines) {
-            line = line.trim();
-            if (!line) {
-                empty += 1;
-                continue;
-            }
-            source += 1;
+    const reg = languages[fileExtname].comment;
+    reg.lastIndex = 0;
+    if (reg) {
+        content.match(reg)?.forEach((comm) => {
+            const res = comm.split("\n");
+            comment += res.length;
+            source -= res.length;
+        });
+    }
+    const lines = content.split("\n");
+    total += lines.length;
+    for (let line of lines) {
+        line = line.trim();
+        if (!line) {
+            empty += 1;
+            continue;
         }
-    } catch (err) {
-        console.log(err.message);
+        source += 1;
     }
 }

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "cc-codeline",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "main": "bin.js",
-  "description": "Quickly count your lines of code",
+  "description": "Quickly count the number of lines of code and files",
   "bin": {
     "codeline": "./bin.js"
   },
@@ -13,4 +13,4 @@
   "author": "",
   "license": "MIT",
   "type": "commonjs"
-}
+}