crabatool 1.0.94 → 1.0.95

package/package.json

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

package/tool/checkjs.js

@@ -90,7 +90,8 @@ module.exports.start = async function() {
     if (eslintResults.length > 0 && eslintResults[0].errorCount > 0) {
       var res = eslintResults[0];
       res.messages.forEach((item) => {
-        if (item.message.test(/'\$\w+'\sis\snot\sdefined\./)) return; // $字符开头的全局变量不输出
+        var reg = new RegExp(/'\$\w+'\sis\snot\sdefined\./);
+        if (reg.test(item.message)) return; // $字符开头的全局变量不输出
         errInfo.list.push({ char: item.ruleId + '，' + item.messageId, line: item.line, endLine: item.endLine, column: item.column, msg: item.message });
       });
 

package/tool/install.js

@@ -71,24 +71,35 @@ class Install {
     var xmldata = JSON.parse(xmljs.xml2json(xml, { compact: true, spaces: 2 }));
 
     var add = false;
+    var save = false;
     var xn = utils.selectSingleNode(xmldata, "/application/component/extensionMap");
     if (!xn) {
-      xn = { mapping: [] };
+      xn = { mapping: { _attributes: { ext: 'gspx', type: 'XML' } } };
       utils.addSingleNode(xmldata, "/application/component/extensionMap", xn);
-      add = true;
+      save = true;
     } else {
-      if (!xn.mapping) xn.mapping = [];
-      var child = xn.mapping.filter(data => { return data._attributes.ext == 'gspx'; });
-      if (child.length == 0) add = true;
+      if (!xn.mapping) xn.mapping = { _attributes: { ext: 'gspx', type: 'XML' } };
+
+      if (xn.mapping instanceof Array) {
+        var child = xn.mapping.filter(data => { return data._attributes.ext == 'gspx'; });
+        add = child.length == 0;
+      } else if (xn.mapping._attributes.ext == 'gspx') {
+        xn.mapping._attributes.type = 'XML';
+        save = true;
+      } else {
+        var old = JSON.parse(JSON.stringify(xn.mapping));
+        xn.mapping = [];
+        xn.mapping.push(old);
+        add = true;
+      }
     }
 
     if (add) {
-      xn.mapping.push({
-        _attributes: {
-          ext: 'gspx', type: 'XML'
-        }
-      });
+      xn.mapping.push({ _attributes: { ext: 'gspx', type: 'XML' } });
+      save = true;
+    }
 
+    if (save) {
       xml = xmljs.json2xml(xmldata, { compact: true, ignoreComment: true, spaces: 2 });
       fs.writeFileSync(fileTypes, xml);
     }