crabatool 1.0.508 → 1.0.510

package/lib/jsoncrud.js

@@ -67,11 +67,11 @@ class JSONCRUD {
     }
   }
 
-  async batchCreate(entityName, items) { 
+  async batchCreate(entityName, items) {
     await this.ready()
     this.verifyEntityExists(entityName)
     var _this = this;
-    items.forEach(item=>{
+    items.forEach(item => {
       const newItem = {
         id: cuid.newCuidString(),//允许外部提前制定ID
         ...item,
@@ -119,7 +119,7 @@ class JSONCRUD {
       } else if (typeof v1 == 'number') {
         return sortOrder === 'acs' ? v1 > v2 : v1 < v2;
       } else {
-        return sortOrder === 'asc' ? v1?.localeCompare(v2) : v2?.localeCompare(v1);
+        return sortOrder === 'asc' ? v1.localeCompare(v2) : v2.localeCompare(v1);
       }
     });
 
@@ -239,7 +239,7 @@ class JSONCRUD {
         if (stats.isFile()) {
           var entityName = file.substring(0, file.lastIndexOf('.'));
           var temp = await fs.readFile(filePath, 'utf-8')
-          fileContent[entityName] = temp?JSON.parse(temp):{};
+          fileContent[entityName] = temp ? JSON.parse(temp) : {};
         } else if (stats.isDirectory()) {
           // 如果需要递归处理子目录，可以在这里调用readAllFilesInDirectory(filePath)
         }

package/lib/utils.js

@@ -10,19 +10,27 @@ var axios = require('axios');
 var os = require('os');
 
 if (!String.prototype.replaceAll) {
-  String.prototype.replaceAll = function (s1, s2) {
-    return this.replace(new RegExp(s1, 'gm'), s2);
+  String.prototype.replaceAll = function(search, replacement) {
+    function escapeRegExp(string) {
+      return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    }
+
+    if (typeof search === 'string') {
+      search = escapeRegExp(search);
+    }
+
+    return this.replace(new RegExp(search, 'g'), replacement);
   };
 }
 
-Buffer.prototype.toByteArray = function () {
+Buffer.prototype.toByteArray = function() {
   return Array.prototype.slice.call(this, 0);
 };
-Date.prototype.toString = function (format) {
+Date.prototype.toString = function(format) {
   if (!format) format = 'yyyy-MM-dd hh:mm:ss';
   return this.format(format);
 };
-Date.prototype.format = function (fmt) {
+Date.prototype.format = function(fmt) {
   var o = {
     'M+': this.getMonth() + 1, //月份
     'd+': this.getDate(), //日
@@ -42,7 +50,7 @@ Date.prototype.format = function (fmt) {
       );
   return fmt;
 };
-Date.prototype.toJSON = function () {
+Date.prototype.toJSON = function() {
   return this.format('yyyy-MM-dd hh:mm:ss');
 };
 
@@ -163,7 +171,7 @@ class Utils {
     }
 
     var text = args[0];
-    text = text.replace(/{-?[0-9]+}/g, function (match, format) {
+    text = text.replace(/{-?[0-9]+}/g, function(match, format) {
       var intVal = parseInt(match.substring(1, match.length - 1));
       var replace;
       if (intVal >= 0) {
@@ -376,7 +384,7 @@ class Utils {
       return;
     }
 
-    fs.readdirSync(dirname).forEach(function (file) {
+    fs.readdirSync(dirname).forEach(function(file) {
       var filePath = utils.join(dirname, file);
       if (fs.statSync(filePath).isDirectory()) {
         //递归读取文件
@@ -510,11 +518,11 @@ class Utils {
       data: data,
       headers: { 'Content-Type': 'application/json' },
     })
-      .then(function (response) {
+      .then(function(response) {
         //console.log("推送代码检测状态");
         //console.log(response.data);
       })
-      .catch(function (error) {
+      .catch(function(error) {
         //console.log("推送代码检测失败:" + error.message);
         //console.log(error);
       });
@@ -607,7 +615,7 @@ class Utils {
     }
 
     var files = fs.readdirSync(source);
-    files.forEach(function (fileName) {
+    files.forEach(function(fileName) {
       if (fileName == 'node_modules') {
         return;
       }
@@ -646,7 +654,7 @@ class Utils {
 
   copyFiles(source, dest, ignores, cb) {
     var files = utils.getFiles({ source: source, ignores: ignores });
-    files.forEach(function (filePath) {
+    files.forEach(function(filePath) {
       var fileName = filePath.replace(source, ''); // 去掉根路径
       var destPath = utils.join(dest, fileName);
 
@@ -766,7 +774,7 @@ class Utils {
       timeout: config.timeout,
       responseType: 'stream',
     })
-      .then(function (response) {
+      .then(function(response) {
         if (callback === true) {
           //fs.fchmodSync(path.dirname(savePath), '0711'); // 修改权限
           //fs.chmodSync(path.dirname(savePath), '0711');
@@ -778,7 +786,7 @@ class Utils {
           if (typeof callback == 'function') callback(savePath);
         });
       })
-      .catch(function (error) {
+      .catch(function(error) {
         //console.log('[内网才能访问]，network error');
         console.log(error.code, error.response.status, error.message);
       });
@@ -857,10 +865,10 @@ class Utils {
       email = '';
     try {
       name = String(execSync('git config user.name', { cwd: cwd || process.cwd() })).trim();
-    } catch (e) {}
+    } catch (e) { }
     try {
       email = String(execSync('git config user.email', { cwd: cwd || process.cwd() })).trim();
-    } catch (e) {}
+    } catch (e) { }
     return { name, email };
   }
 
@@ -1032,28 +1040,28 @@ class Utils {
 
       const git = envData.git;
       const project = envData.project;
-      
+
       // 1. 提取关键信息
       const gitUser = git.user || {};
       const userName = gitUser.name || 'unknown';
       const userEmail = gitUser.email || 'unknown';
       const remoteUrl = git.remoteUrl || '';
       const projectPath = project.path || '';
-      
+
       // 2. 标准化远程URL（去除协议和.git后缀，统一格式）
       let normalizedRemoteUrl = remoteUrl
         .replace(/^(https?:\/\/|git@|ssh:\/\/git@)/, '') // 去除协议前缀
         .replace(/\.git$/, '') // 去除.git后缀
         .replace(/:/g, '/') // 统一分隔符
         .toLowerCase(); // 转小写
-      
+
       // 3. 提取项目路径特征（取最后两级目录）
       const pathParts = projectPath.split(path.sep).filter(p => p);
       const projectPathFeature = pathParts.slice(-2).join('/');
-      
+
       // 4. 提取分支信息
       const branchName = git.branch || 'unknown';
-      
+
       // 5. 构建标识符组件
       const components = [
         `user:${userName}:${userEmail}`,
@@ -1061,16 +1069,16 @@ class Utils {
         `branch:${branchName}`,
         `path:${projectPathFeature}`
       ];
-      
+
       // 6. 生成哈希值确保唯一性
       const combinedString = components.join('|');
       const hash = this.md5(combinedString);
-      
+
       // 7. 格式化输出：前缀-哈希前8位-哈希后8位
       const shortHash = hash.substring(0, 8);
       const tailHash = hash.substring(-8);
       const identifier = `proj-${shortHash}-${tailHash}`;
-      
+
       return {
         identifier: identifier,
         hash: hash,
@@ -1159,7 +1167,7 @@ class Utils {
 
       // 异步上报，不阻塞主流程
       // setImmediate(function () {
-        utils.sendEnvToBackend(envData);
+      utils.sendEnvToBackend(envData);
       // });
 
       return envData;
@@ -1190,10 +1198,10 @@ class Utils {
         headers: { 'Content-Type': 'application/json' },
         timeout: 2000,
       })
-        .then(function () {
+        .then(function() {
           // 静默，不打印
         })
-        .catch(function (error) {
+        .catch(function(error) {
           // 静默失败，不抛出
           if (config.Debug) {
             console.log('环境信息上报失败:' + (error && error.message ? error.message : error));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.508",
+  "version": "1.0.510",
   "description": "crabatool",
   "main": "index.js",
   "bin": {
@@ -10,6 +10,7 @@
     "javadocFile": "node ./test/test.js -convertJavadoc -filePath F:/docs/shell/com/wsgjp/ct/shell/biz/entity/Etype.html -outPath F:/docs/md",
     "shell-doc": "node ./test/test.js -convertJavadoc -targetPath F:/docs/shell -outPath F:/docs/shell.json",
     "jxc-doc": "node ./test/test.js -convertJavadoc -targetPath F:/docs/jxc -outPath F:/docs/jxc.json",
+    "sale-doc": "node ./test/test.js -convertJavadoc -targetPath F:/docs/sale -outPath F:/docs/sale.json",
     "start": "node run.js",
     "test": "node ./test/test.js",
     "run": "node ./test/test.js -run -webPath F:/basicweb/www -refresh true",