crabatool 1.0.91 → 1.0.94

package/.eslintrc.json

@@ -53,6 +53,13 @@
         "$create": "readonly",
         "$addHandler": "readonly",
         "$searchUtils": "readonly",
-        "$crabaJSON": "readonly"
+        "$crabaJSON": "readonly",
+        "asyncCall": "readonly",
+        "$clearHandlers": "readonly",
+        "$removeHandler": "readonly",
+        "getClientBounds": "readonly",
+        "echarts": "readonly",
+        "SysConsts": "readonly",
+        "math": "readonly"
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.91",
+  "version": "1.0.94",
   "description": "crabatool",
   "main": "index.js",
   "scripts": {

package/test/test.js

@@ -41,8 +41,10 @@ var config = {
 
   Debug: true,
 
+  // 告诉助手项目有哪些是全局变量，不然会提示未定义
   globals: ['crabadoc', 'Type', 'CrabaMarkdown', '$doc', 'www', 'crabaJs'],
 
+  // 告诉助手项目有哪些js忽略语法检查，可以填目录
   ignoreCheck: ['js/lib/highlight.min.js', 'js/lib/markdown-it.min.js', 'Pages/Component.min.js'],
 
   // 配置js语法检测报告推送地址

package/tool/checkjs.js

@@ -14,7 +14,7 @@ var fileSize = 300;
 // 默认忽略大小的文件
 var blackList = ['agency.js', 'craba.min.js', 'crabaEx.min.js', 'crabaNgp.js', 'echarts-all.js', 'echarts.min.js', 'math.min.js', 'craba.rollup.min.js'];
 // 语法规则，不能包含这些关键词
-var dangerousJs = ['\\slet\\s', '\\sconst\\s', '\=\>\\s?\\(?\\{', '\\sasync\\s', '\\sawait\\s', '\\.then\\(', '\\sdebugger\\s'];
+var dangerousJs = ['\\slet\\s', '\\sconst\\s', '\=\>\\s?\\(?\\{', '\\sasync\\s', '\\sawait\\s', '\\.then\\(', '\\sdebugger\\s', 'for\\s?\\(.*?\\sin.*?\\)'];
 
 // gspx无用标签的修改建议
 var warnTagsInfo = {
@@ -89,16 +89,19 @@ module.exports.start = async function() {
     var errInfo = { list: [] };
     if (eslintResults.length > 0 && eslintResults[0].errorCount > 0) {
       var res = eslintResults[0];
-      errList.push(filePath);
-      errRegList.push(errInfo);
-
       res.messages.forEach((item) => {
+        if (item.message.test(/'\$\w+'\sis\snot\sdefined\./)) return; // $字符开头的全局变量不输出
         errInfo.list.push({ char: item.ruleId + '，' + item.messageId, line: item.line, endLine: item.endLine, column: item.column, msg: item.message });
       });
+
+      if (errInfo.list.length > 0) {
+        errList.push(filePath);
+        errRegList.push(errInfo);
+      }
     }
 
     // ------检查语法1--------
-    var reg = new RegExp(dangerousJs.join('|'), 'ig');
+    var reg = new RegExp(dangerousJs.join('|'));
     if (reg.test(content)) { // 先检查是否有危险字符
       var noComment = utils.clearComment(content);// 去掉注释的代码再查一遍；因为js里面有些危险字符是被注释了的
 
@@ -294,7 +297,7 @@ function getMathReuslts(content, nreg, filterFun) {
   while (!v.done) {
     var value = v.value[0];
     if (!filterFun || filterFun(value)) {
-      list.push({ "char": value, "column": v.value.index });
+      list.push({ "char": value, "column": v.value.index, 'msg': '兼容性问题，不推荐使用' });
     }
     v = all.next();
   }