Fix #313 - bring back the eslint checks into a working state (#317)

Co-authored-by: pancake <[email protected]>

.ci-scripts/ci-eslint.sh

@@ -2,7 +2,8 @@
 set -e
 
 ## NPM eslint
-npm install -s eslint
+mkdir node_modules
+npm install --save-dev eslint
 
 ## NPM test
-find ./libdec -type f -name "*.js" | xargs node_modules/.bin/eslint -c ./.eslintrc.json
+find ./js -type f -name "*.js" | xargs node_modules/.bin/eslint -c .eslint.config.js

.eslint.config.js

@@ -0,0 +1,44 @@
+module.exports = {
+	"languageOptions": {
+		"parserOptions": {
+			"ecmaVersion": "latest",
+			"sourceType": "module",
+			"ecmaFeatures": {}
+		},
+		"globals": {
+			"process": true,
+			"BigInt": true,
+			"Global": true,
+			"Limits": true,
+			"radare2": true,
+			"atob": true,
+			"btoa": true,
+			"unit": true,
+			"console": true
+		}
+	},
+	//"extends": "eslint:recommended",
+	"rules": {
+		"semi": [2, "always"],
+		"no-console": ["error", {
+			"allow": ["log"]
+		}],
+		"no-redeclare": ["error", {
+			"builtinGlobals": false
+		}],
+		"no-empty": ["error", {
+			"allowEmptyCatch": true
+		}],
+		"no-unused-vars": ["error", {
+			"varsIgnorePattern": "r2dec_|\\binclude\\b",
+			"args": "none"
+		}],
+		"curly": "error",
+		"no-sparse-arrays": "warn",
+		"no-cond-assign": ["error", "except-parens"],
+		"no-constant-condition": ["error", {
+			"checkLoops": false
+		}],
+		"no-control-regex": "warn"
+	},
+};

js/libdec/arch/x86.js

@@ -73,6 +73,7 @@ var _value_at = function(address) {
                 return x.length > 1 ? x : '0' + x;
             }).join('');
             return Long.from(p, true, 16);
+            // eslint-disable-next-line no-unused-vars
         } catch (e) {}
     }
     return null;
@@ -2329,4 +2330,4 @@ var _apply_math_x86 = {
     },
 };
 
-export default x86x64;
+export default x86x64;

js/libdec/core/classes.js

@@ -16,4 +16,4 @@ export default function(icj) {
 		}
 		return null;
 	};
-}
+}

js/libdec/core/extra.js

@@ -199,6 +199,7 @@ const _tryas = {
 	int: function(x) {
 		try {
 			return Long.from(x.trim(), false, (x.trim().indexOf('0x') == 0 ? 16 : 10));
+			// eslint-disable-next-line no-unused-vars
 		} catch (e) {}
 		return x;
 	}
@@ -221,4 +222,4 @@ export default {
 		}
 		return _magic_math_values[address];
 	}
-};
+};

js/libdec/long.js

@@ -101,4 +101,4 @@ Long.MAX_S32_VALUE = new Long(Limits.ST32_MAX, false);
 Long.MAX_S16_VALUE = new Long(Limits.ST16_MAX, false);
 
 
-export default Long;
+export default Long;

js/libdec/r2pipe.js

@@ -24,6 +24,7 @@ function r2json(m, def) {
 	var x = r2str(m, true);
 	try {
 		return x.length > 0 ? JSONex.parse(x) : def;
+		// eslint-disable-next-line no-unused-vars
 	} catch(e){}
 	return def;
 }
@@ -33,6 +34,7 @@ function r2int(value, def) {
 	if (x != '') {
 		try {
 			return parseInt(x);
+			// eslint-disable-next-line no-unused-vars
 		} catch (e) {}
 	}
 	return def || 0;
@@ -43,6 +45,7 @@ function r2long(value, def) {
 	if (x != '') {
 		try {
 			return Long.from(x, true);
+			// eslint-disable-next-line no-unused-vars
 		} catch (e) {}
 	}
 	return def || Long.UZERO;