Skip to content

Commit

Permalink
Fix for...in
Browse files Browse the repository at this point in the history
  • Loading branch information
salesh committed Jan 15, 2021
1 parent 8f637d7 commit 98e31c0
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 24 deletions.
8 changes: 3 additions & 5 deletions browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -231,12 +231,11 @@ function asObject (logger, level, args, ts) {
}

function applySerializers (args, serialize, serializers, stdErrSerialize) {
/* eslint no-var: off */
for (var i in args) {
for (const i in args) {
if (stdErrSerialize && args[i] instanceof Error) {
args[i] = pino.stdSerializers.err(args[i])
} else if (typeof args[i] === 'object' && !Array.isArray(args[i])) {
for (var k in args[i]) {
for (const k in args[i]) {
if (serialize && serialize.indexOf(k) > -1 && k in serializers) {
args[i][k] = serializers[k](args[i][k])
}
Expand Down Expand Up @@ -300,8 +299,7 @@ function asErrValue (err) {
msg: err.message,
stack: err.stack
}
/* eslint no-var: off */
for (var key in err) {
for (const key in err) {
if (obj[key] === undefined) {
obj[key] = err[key]
}
Expand Down
9 changes: 3 additions & 6 deletions lib/levels.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ function genLsCache (instance) {
const formatter = instance[formattersSym].level
const { labels } = instance.levels
const cache = {}
/* eslint no-var: off */
for (var label in labels) {
for (const label in labels) {
const level = formatter(labels[label], Number(label))
cache[label] = JSON.stringify(level).slice(0, -1)
}
Expand Down Expand Up @@ -94,8 +93,7 @@ function setLevel (level) {
const useOnlyCustomLevelsVal = this[useOnlyCustomLevelsSym]
const hook = this[hooksSym].logMethod

/* eslint no-var: off */
for (var key in values) {
for (const key in values) {
if (levelVal > values[key]) {
this[key] = noop
continue
Expand Down Expand Up @@ -170,8 +168,7 @@ function assertDefaultLevelFound (defaultLevel, customLevels, useOnlyCustomLevel

function assertNoLevelCollisions (levels, customLevels) {
const { labels, values } = levels
/* eslint no-var: off */
for (var k in customLevels) {
for (const k in customLevels) {
if (k in values) {
throw Error('levels cannot be overridden')
}
Expand Down
6 changes: 3 additions & 3 deletions lib/proto.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,17 +81,17 @@ function child (bindings) {
if (bindings.hasOwnProperty('serializers') === true) {
instance[serializersSym] = Object.create(null)

/* eslint no-var: off */
for (var k in serializers) {
for (const k in serializers) {
instance[serializersSym][k] = serializers[k]
}
const parentSymbols = Object.getOwnPropertySymbols(serializers)
/* eslint no-var: off */
for (var i = 0; i < parentSymbols.length; i++) {
const ks = parentSymbols[i]
instance[serializersSym][ks] = serializers[ks]
}

for (var bk in bindings.serializers) {
for (const bk in bindings.serializers) {
instance[serializersSym][bk] = bindings.serializers[bk]
}
const bindingsSymbols = Object.getOwnPropertySymbols(bindings.serializers)
Expand Down
12 changes: 4 additions & 8 deletions lib/tools.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,7 @@ function asJson (obj, msg, num, time) {
obj[messageKey] = msg
}
const wildcardStringifier = stringifiers[wildcardFirstSym]
/* eslint no-var: off */
for (var key in obj) {
for (const key in obj) {
value = obj[key]
if ((notHasOwnProperty || obj.hasOwnProperty(key)) && value !== undefined) {
value = serializers[key] ? serializers[key](value) : value
Expand Down Expand Up @@ -149,7 +148,6 @@ function asJson (obj, msg, num, time) {
}

function asChindings (instance, bindings) {
var key
let value
let data = instance[chindingsSym]
const stringify = instance[stringifySym]
Expand All @@ -159,8 +157,7 @@ function asChindings (instance, bindings) {
const formatter = instance[formattersSym].bindings
bindings = formatter(bindings)

/* eslint no-var: off */
for (key in bindings) {
for (const key in bindings) {
value = bindings[key]
const valid = key !== 'level' &&
key !== 'serializers' &&
Expand Down Expand Up @@ -263,17 +260,16 @@ function prettifierMetaWrapper (pretty, dest, opts) {

const serializers = lastLogger[serializersSym]
const keys = Object.keys(serializers)
var key

/* eslint no-var: off */
for (var i = 0; i < keys.length; i++) {
key = keys[i]
const key = keys[i]
if (obj[key] !== undefined) {
obj[key] = serializers[key](obj[key])
}
}

for (key in chindings) {
for (const key in chindings) {
if (!obj.hasOwnProperty(key)) {
obj[key] = chindings[key]
}
Expand Down
3 changes: 1 addition & 2 deletions test/browser.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@ test('exposes levels object', ({ end, same }) => {
test('exposes faux stdSerializers', ({ end, ok, same }) => {
ok(pino.stdSerializers)
// make sure faux stdSerializers match pino-std-serializers
/* eslint no-var: off */
for (var serializer in pinoStdSerializers) {
for (const serializer in pinoStdSerializers) {
ok(pino.stdSerializers[serializer], `pino.stdSerializers.${serializer}`)
}
// confirm faux methods return empty objects
Expand Down

0 comments on commit 98e31c0

Please sign in to comment.