finish linting errors for no-restricted-syntax. 1 remains: couldn't r…

…esolve removing iterator loops for urlSearchParams

.eslintrc.js

@@ -66,7 +66,7 @@ module.exports = {
 		}],
 		'no-plusplus': [0],
 		'no-prototype-builtins': [1],
-		'no-restricted-syntax': [0], // TODO: enable this check
+		'no-restricted-syntax': [1],
 		'no-tabs': [0],
 		'no-underscore-dangle': [0],
 		'no-unused-vars': [1],

app/panel/reducers/settings.js

@@ -34,7 +34,6 @@ import {
 	updateTrackerBlocked, updateCategoryBlocked, updateBlockAllTrackers, toggleExpandAll
 } from '../utils/blocking';
 import { sendMessage } from '../utils/msg';
-import { objectEntries } from '../../../src/utils/common';
 
 const initialState = {
 	expand_all_trackers: false,
@@ -195,8 +194,10 @@ const _importSettingsDialog = (state, action) => {
 const _importSettingsNative = (state, action) => {
 	const { settings } = action;
 	const updated_state = {};
-	// eslint-disable-next-line prefer-const
-	for (let [key, value] of objectEntries(settings)) {
+	const settingsKeys = Object.keys(settings);
+	for (let i = 0; i < settingsKeys.length; i++) {
+		const key = settingsKeys[i];
+		let value = settings[key];
 		if (key === 'alert_bubble_timeout') {
 			value = (value > 30) ? 30 : value;
 		}

src/classes/Account.js

@@ -40,7 +40,8 @@ class Account {
 		const opts = {
 			errorHandler: errors => (
 				new Promise((resolve, reject) => {
-					for (const err of errors) {
+					for (let i = 0; i < errors.length; i++) {
+						const err = errors[i];
 						switch (err.code) {
 							case '10020': // token is not valid
 							case '10060': // user id does not match
@@ -346,10 +347,12 @@ class Account {
 
 		// check scopes
 		if (userScopes.indexOf('god') >= 0) { return true; }
-		for (const sArr of required) {
+		for (let i = 0; i < required.length; i++) {
+			const sArr = required[i];
 			let matches = true;
 			if (sArr.length > 0) {
-				for (const s of sArr) {
+				for (let j = 0; j < sArr.length; j++) {
+					const s = sArr[j];
 					if (userScopes.indexOf(s) === -1) {
 						matches = false;
 						break;

src/classes/BugDb.js

@@ -84,7 +84,9 @@ class BugDb extends Updatable {
 		const categoryArray = [];
 		const categories = {};
 
-		for (appId in db.apps) {
+		const appIds = Object.keys(db.apps);
+		for (let i = 0; i < appIds.length; i++) {
+			appId = appIds[i];
 			if (Object.prototype.hasOwnProperty.call(db.apps, appId)) {
 				category = db.apps[appId].cat;
 				if (t(`category_${category}`) === `category_${category}`) {
@@ -181,7 +183,9 @@ class BugDb extends Updatable {
 
 		log('initializing bugdb regexes...');
 
-		for (const id in regexes) {
+		const regexesKeys = Object.keys(regexes);
+		for (let i = 0; i < regexesKeys.length; i++) {
+			const id = regexesKeys[i];
 			if (Object.prototype.hasOwnProperty.call(regexes, id)) {
 				db.patterns.regex[id] = new RegExp(regexes[id], 'i');
 			}

src/classes/Click2PlayDb.js

@@ -68,9 +68,11 @@ class Click2PlayDb extends Updatable {
 	reset(tab_id) {
 		if (!Object.prototype.hasOwnProperty.call(this.allowOnceList, tab_id)) { return; }
 
-		const entries = Object.entries(this.allowOnceList[tab_id]);
 		let keep = false;
-		for (const [appID, count] of entries) {
+		const allowKeys = Object.keys(this.allowOnceList[tab_id]);
+		for (let i = 0; i < allowKeys.length; i++) {
+			const appID = allowKeys[i];
+			const count = this.allowOnceList[tab_id][appID];
 			const newCount = count - 1;
 			this.allowOnceList[tab_id][appID] = newCount;
 			if (newCount > 0) {

src/classes/PanelData.js

@@ -29,7 +29,7 @@ import dispatcher from './Dispatcher';
 import promoModals from './PromoModals';
 import { getCliqzGhosteryBugs, sendCliqzModuleCounts } from '../utils/cliqzModulesData';
 import { getActiveTab, flushChromeMemoryCache, processUrl } from '../utils/utils';
-import { objectEntries, log } from '../utils/common';
+import { log } from '../utils/common';
 
 const SYNC_SET = new Set(globals.SYNC_ARRAY);
 const { IS_CLIQZ } = globals;
@@ -586,8 +586,10 @@ class PanelData {
 		}
 
 		// Set the conf from data
-		// TODO can this now be replaced by Object.entries?
-		for (const [key, value] of objectEntries(data)) {
+		const dataKeys = Object.keys(data);
+		for (let i = 0; i < dataKeys.length; i++) {
+			const key = dataKeys[i];
+			const value = data[key];
 			if (Object.prototype.hasOwnProperty.call(conf, key) && !isEqual(conf[key], value)) {
 				conf[key] = value;
 				syncSetDataChanged = SYNC_SET.has(key) ? true : syncSetDataChanged;

src/utils/cliqzModulesData.js

@@ -58,15 +58,17 @@ export function getCliqzData(tabId, tabHostUrl, antiTracking) {
 		return tracker.ads;
 	};
 
-	for (const bug of bugsValues) {
+	for (let i = 0; i < bugsValues.length; i++) {
+		const bug = bugsValues[i];
 		const dataPoints = getDataPoints(bug);
 		if (dataPoints) {
 			totalUnsafeCount += dataPoints;
 			trackerCount++;
 		}
 	}
 
-	for (const other of othersValues) {
+	for (let i = 0; i < othersValues.length; i++) {
+		const other = othersValues[i];
 		let whitelisted = false;
 		const dataPoints = getDataPoints(other);
 

src/utils/common.js

@@ -157,25 +157,6 @@ export function hashCode(str) {
 	return hash;
 }
 
-/**
- * Generator which makes object iterable with for...of loop
- * @memberOf BackgroundUtils
- *
- * @param  {Object} 	object over which own enumerable properties we want to iterate
- * @return {Object}		Generator object
- */
-
-export function* objectEntries(obj) {
-	const propKeys = Object.keys(obj);
-
-	for (const propKey of propKeys) {
-		// `yield` returns a value and then pauses
-		// the generator. Later, execution continues
-		// where it was previously paused.
-		yield [propKey, obj[propKey]];
-	}
-}
-
 /**
  * Unescape base64-encoded string.
  * @private

src/utils/utils.js

@@ -22,7 +22,7 @@ import { debounce } from 'underscore';
 import { URL } from '@cliqz/url-parser';
 import tabInfo from '../classes/TabInfo';
 import globals from '../classes/Globals';
-import { log, objectEntries } from './common';
+import { log } from './common';
 
 const { BROWSER_INFO } = globals;
 const IS_FIREFOX = (BROWSER_INFO.name === 'firefox');
@@ -355,7 +355,10 @@ function _fetchJson(method, url, query, extraHeaders, referrer = 'no-referrer',
 			Accept: 'application/json'
 		});
 		if (extraHeaders) {
-			for (const [key, value] of objectEntries(extraHeaders)) {
+			const extraHeadersKeys = Object.keys(extraHeaders);
+			for (let i = 0; i < extraHeadersKeys.length; i++) {
+				const key = extraHeadersKeys[i];
+				const value = extraHeaders[key];
 				headers.append(key, value);
 			}
 		}
@@ -448,7 +451,10 @@ function _fetchJson(method, url, query, extraHeaders, referrer = 'no-referrer',
 		xhr.setRequestHeader('Content-Type', 'application/json');
 		xhr.setRequestHeader('Accept', 'application/json');
 		if (extraHeaders) {
-			for (const [key, value] of objectEntries(extraHeaders)) {
+			const extraHeadersKeys = Object.keys(extraHeaders);
+			for (let i = 0; i < extraHeadersKeys.length; i++) {
+				const key = extraHeadersKeys[i];
+				const value = extraHeaders[key];
 				xhr.setRequestHeader(key, value);
 			}
 		}

test/src/Foundbugs.test.js

@@ -47,7 +47,7 @@ describe('src/classes/FoundBugs.js', () => {
 				"614": {"name": "New Relic","cat": "site_analytics","tags": [48]}},
 				"bugs": {"2": {"aid": 13},"935": {"aid": 13},"1982": {"aid": 13},"719": {"aid": 464},"1009": {"aid": 614}},
 				"firstPartyExceptions": {'something': true},
-				"patterns": {'something': true},
+				"patterns": { regex: { 'something': true} },
 				"version":416
 			});
 			// Mock bugDb fetch response

test/utils/matcher.test.js

@@ -19,6 +19,7 @@ describe('src/utils/matcher.js', () => {
 	beforeAll(done => {
 		// Fake the XMLHttpRequest for fetchJson(/daabases/bugs.json)
 		const bugsJson = JSON.stringify({
+			"apps": {},
 			"firstPartyExceptions": {
 				"101": [
 					"google.com/ig"
@@ -32,6 +33,7 @@ describe('src/utils/matcher.js', () => {
 				]
 			},
 			"patterns": {
+				"regex": {},
 				"host": {
 					"com": {
 						"gmodules": {

tools/leet/leet-en.js

@@ -62,11 +62,12 @@ const leet_convert = function(string) {
 		// 'z': 'z',
 	};
 
-	let letter;
 	let output = string || '';
 	output = output.replace(/cks/g, 'x');
 
-	for (letter in characterMap) {
+	const characterKeys = Object.keys(characterMap);
+	for (let i = 0; i < characterKeys.length; i++) {
+		const letter = characterKeys[i];
 		if (Object.prototype.hasOwnProperty.call(characterMap, letter)) {
 			output = output.replace(new RegExp(letter, 'g'), characterMap[letter]);
 		}
@@ -82,11 +83,12 @@ if (!fs.existsSync('./tools/leet/messages.en.copy.json')) {
 
 	// Import the copied messages file
 	const leet = {};
-	let key;
 	const en = jsonfile.readFileSync('./tools/leet/messages.en.copy.json');
 
 	// Create a LEETed version of the messages.json file
-	for (key in en) {
+	const enKeys = Object.keys(en);
+	for (let i = 0; i < enKeys.length; i++) {
+		const key = enKeys[i];
 		if (Object.prototype.hasOwnProperty.call(en[key], 'message')) {
 			const message = leet_convert(en[key].message);
 			const { placeholders } = en[key];