chore: eslint no-var, vars-on-top

This commit is contained in:
Peter Jaszkowiak
2021-02-04 00:06:15 -07:00
committed by Julian Lam
parent b56d9e12b5
commit dab3b23575
255 changed files with 1988 additions and 1995 deletions

View File

@@ -21,7 +21,7 @@ connection.getConnectionOptions = function (postgres) {
postgres.database = 'nodebb';
}
var connOptions = {
const connOptions = {
host: postgres.host,
port: postgres.port,
user: postgres.username,

View File

@@ -1,7 +1,7 @@
'use strict';
module.exports = function (module) {
var helpers = require('./helpers');
const helpers = require('./helpers');
module.setObject = async function (key, data) {
if (!key || !data) {
@@ -158,7 +158,7 @@ SELECT (SELECT jsonb_object_agg(f, d."value")
return res.rows[0].d;
}
var obj = {};
const obj = {};
fields.forEach((f) => {
obj[f] = null;
});

View File

@@ -1,17 +1,17 @@
'use strict';
var helpers = module.exports;
const helpers = module.exports;
helpers.valueToString = function (value) {
return String(value);
};
helpers.removeDuplicateValues = function (values) {
var others = Array.prototype.slice.call(arguments, 1);
for (var i = 0; i < values.length; i++) {
const others = Array.prototype.slice.call(arguments, 1);
for (let i = 0; i < values.length; i++) {
if (values.lastIndexOf(values[i]) !== i) {
values.splice(i, 1);
for (var j = 0; j < others.length; j++) {
for (let j = 0; j < others.length; j++) {
others[j].splice(i, 1);
}
i -= 1;
@@ -81,14 +81,14 @@ SELECT "_key", "type"
values: [keys],
});
var invalid = res.rows.filter(r => r.type !== type);
const invalid = res.rows.filter(r => r.type !== type);
if (invalid.length) {
const parts = invalid.map(r => `${JSON.stringify(r._key)} is ${r.type}`);
throw new Error(`database: cannot insert multiple objects as ${type} because they already exist: ${parts.join(', ')}`);
}
var missing = keys.filter(k => !res.rows.some(r => r._key === k));
const missing = keys.filter(k => !res.rows.some(r => r._key === k));
if (missing.length) {
throw new Error(`database: failed to insert keys for objects: ${JSON.stringify(missing)}`);

View File

@@ -1,7 +1,7 @@
'use strict';
module.exports = function (module) {
var helpers = require('./helpers');
const helpers = require('./helpers');
module.listPrepend = async function (key, value) {
if (!key) {

View File

@@ -1,9 +1,9 @@
'use strict';
var _ = require('lodash');
const _ = require('lodash');
module.exports = function (module) {
var helpers = require('./helpers');
const helpers = require('./helpers');
module.setAdd = async function (key, value) {
if (!Array.isArray(value)) {

View File

@@ -1,9 +1,9 @@
'use strict';
module.exports = function (module) {
var helpers = require('./helpers');
const helpers = require('./helpers');
const util = require('util');
var Cursor = require('pg-cursor');
const Cursor = require('pg-cursor');
Cursor.prototype.readAsync = util.promisify(Cursor.prototype.read);
const sleep = util.promisify(setTimeout);
@@ -41,19 +41,19 @@ module.exports = function (module) {
return [];
}
var reverse = false;
let reverse = false;
if (start === 0 && stop < -1) {
reverse = true;
sort *= -1;
start = Math.abs(stop + 1);
stop = -1;
} else if (start < 0 && stop > start) {
var tmp1 = Math.abs(stop + 1);
const tmp1 = Math.abs(stop + 1);
stop = Math.abs(start + 1);
start = tmp1;
}
var limit = stop - start + 1;
let limit = stop - start + 1;
if (limit <= 0) {
limit = null;
}
@@ -346,7 +346,7 @@ SELECT o."_key" k,
});
return keys.map((k) => {
var s = res.rows.find(r => r.k === k);
const s = res.rows.find(r => r.k === k);
return s ? parseFloat(s.s) : null;
});
};
@@ -375,7 +375,7 @@ SELECT z."value" v,
});
return values.map((v) => {
var s = res.rows.find(r => r.v === v);
const s = res.rows.find(r => r.v === v);
return s ? parseFloat(s.s) : null;
});
};
@@ -507,7 +507,7 @@ RETURNING "score" s`,
};
module.sortedSetLexCount = async function (key, min, max) {
var q = buildLexQuery(key, min, max);
const q = buildLexQuery(key, min, max);
const res = await module.pool.query({
name: `sortedSetLexCount${q.suffix}`,
@@ -528,7 +528,7 @@ SELECT COUNT(*) c
start = start !== undefined ? start : 0;
count = count !== undefined ? count : 0;
var q = buildLexQuery(key, min, max);
const q = buildLexQuery(key, min, max);
q.values.push(start);
q.values.push(count <= 0 ? null : count);
const res = await module.pool.query({
@@ -550,7 +550,7 @@ OFFSET $${q.values.length - 1}::INTEGER`,
}
module.sortedSetRemoveRangeByLex = async function (key, min, max) {
var q = buildLexQuery(key, min, max);
const q = buildLexQuery(key, min, max);
await module.pool.query({
name: `sortedSetRemoveRangeByLex${q.suffix}`,
text: `
@@ -564,7 +564,7 @@ DELETE FROM "legacy_zset" z
};
function buildLexQuery(key, min, max) {
var q = {
const q = {
suffix: '',
where: `o."_key" = $1::TEXT`,
values: [key],
@@ -636,8 +636,8 @@ SELECT z."value",
module.processSortedSet = async function (setKey, process, options) {
const client = await module.pool.connect();
var batchSize = (options || {}).batch || 100;
var cursor = client.query(new Cursor(`
const batchSize = (options || {}).batch || 100;
const cursor = client.query(new Cursor(`
SELECT z."value", z."score"
FROM "legacy_object_live" o
INNER JOIN "legacy_zset" z

View File

@@ -1,8 +1,8 @@
'use strict';
module.exports = function (module) {
var helpers = require('../helpers');
var utils = require('../../../utils');
const helpers = require('../helpers');
const utils = require('../../../utils');
module.sortedSetAdd = async function (key, score, value) {
if (!key) {

View File

@@ -37,11 +37,11 @@ SELECT COUNT(*) c
};
async function getSortedSetIntersect(params) {
var sets = params.sets;
var start = params.hasOwnProperty('start') ? params.start : 0;
var stop = params.hasOwnProperty('stop') ? params.stop : -1;
var weights = params.weights || [];
var aggregate = params.aggregate || 'SUM';
const sets = params.sets;
const start = params.hasOwnProperty('start') ? params.start : 0;
const stop = params.hasOwnProperty('stop') ? params.stop : -1;
let weights = params.weights || [];
const aggregate = params.aggregate || 'SUM';
if (sets.length < weights.length) {
weights = weights.slice(0, sets.length);
@@ -50,7 +50,7 @@ SELECT COUNT(*) c
weights.push(1);
}
var limit = stop - start + 1;
let limit = stop - start + 1;
if (limit <= 0) {
limit = null;
}

View File

@@ -1,7 +1,7 @@
'use strict';
module.exports = function (module) {
var helpers = require('../helpers');
const helpers = require('../helpers');
module.sortedSetRemove = async function (key, value) {
if (!key) {

View File

@@ -31,11 +31,11 @@ SELECT COUNT(DISTINCT z."value") c
};
async function getSortedSetUnion(params) {
var sets = params.sets;
var start = params.hasOwnProperty('start') ? params.start : 0;
var stop = params.hasOwnProperty('stop') ? params.stop : -1;
var weights = params.weights || [];
var aggregate = params.aggregate || 'SUM';
const sets = params.sets;
const start = params.hasOwnProperty('start') ? params.start : 0;
const stop = params.hasOwnProperty('stop') ? params.stop : -1;
let weights = params.weights || [];
const aggregate = params.aggregate || 'SUM';
if (sets.length < weights.length) {
weights = weights.slice(0, sets.length);
@@ -44,7 +44,7 @@ SELECT COUNT(DISTINCT z."value") c
weights.push(1);
}
var limit = stop - start + 1;
let limit = stop - start + 1;
if (limit <= 0) {
limit = null;
}