diff --git a/commitlint.config.js b/commitlint.config.js index a238900..b4e758b 100644 --- a/commitlint.config.js +++ b/commitlint.config.js @@ -16,7 +16,7 @@ module.exports = { "type-empty": [2, "never"], "type-enum": [ 2, "always", - ["build", "chore", "ci", "docs", "feat", "fix", "perf", "refactor", "style", "test"] - ] - } + ["build", "chore", "ci", "docs", "feat", "fix", "perf", "refactor", "style", "test"], + ], + }, }; diff --git a/lib/abstract-writer.js b/lib/abstract-writer.js index 8756a17..5c46a4e 100644 --- a/lib/abstract-writer.js +++ b/lib/abstract-writer.js @@ -15,7 +15,7 @@ var isObject = require("type/object/is") var setDefaultNamespace = getDefaultNamespace.set; -var LogWriter = function (env /*, options */) { +var LogWriter = function (env/*, options */) { if (!(this instanceof LogWriter)) throw new Error("LogWriter cannot be invoked without new"); ensureObject(env); var options = arguments[1]; @@ -77,7 +77,7 @@ Object.defineProperties( }), setupLevelMessagePrefix: d(function (logger) { logger.levelMessagePrefix = this.constructor.levelPrefixes[logger.level]; - }) + }), }, resolveMessageProperties ) diff --git a/lib/printf-modifiers.js b/lib/printf-modifiers.js index d8d9fe1..61b5f56 100644 --- a/lib/printf-modifiers.js +++ b/lib/printf-modifiers.js @@ -21,5 +21,5 @@ module.exports = { .map(function (arg) { return isObject(arg) ? jsonModifier(arg) : stringModifier(arg); }) .join(" "); return str; - } + }, }; diff --git a/lib/private/abstract-writer/resolve-message-properties.js b/lib/private/abstract-writer/resolve-message-properties.js index 13af434..96b6e6e 100644 --- a/lib/private/abstract-writer/resolve-message-properties.js +++ b/lib/private/abstract-writer/resolve-message-properties.js @@ -23,10 +23,10 @@ module.exports = { var logger = event.logger; event.message = [ event.messageTimestamp, event.messageTokens.length ? logger.levelMessagePrefix : null, - event.messageTokens.length ? logger.namespaceMessagePrefix : null, event.messageContent + event.messageTokens.length ? logger.namespaceMessagePrefix : null, event.messageContent, ] .filter(Boolean) .join(" "); }), - writeMessage: d(function (eventIgnored) { throw new Error("Not implemented!"); }) + writeMessage: d(function (eventIgnored) { throw new Error("Not implemented!"); }), }; diff --git a/lib/private/logger-prototype/enable-disable-props.js b/lib/private/logger-prototype/enable-disable-props.js index 13396de..7540de3 100644 --- a/lib/private/logger-prototype/enable-disable-props.js +++ b/lib/private/logger-prototype/enable-disable-props.js @@ -24,7 +24,7 @@ module.exports = { else delete data.logger.isEnabled; }); result.restore = noop; - } + }, }; return result; }), @@ -36,5 +36,5 @@ module.exports = { objForEach(this._childNamespaceLoggers, function (namespacedLogger) { namespacedLogger._setEnabledStateRecursively(newState, cache); }); - }) + }), }; diff --git a/lib/private/logger-prototype/index.js b/lib/private/logger-prototype/index.js index e37f0ef..3266783 100644 --- a/lib/private/logger-prototype/index.js +++ b/lib/private/logger-prototype/index.js @@ -33,7 +33,7 @@ var loggerPrototype = Object.create( }), _createLogger: d(function () { - return setPrototypeOf(function self(msgItemIgnored /*, ...msgItemn*/) { + return setPrototypeOf(function self(msgItemIgnored/*, ...msgItemn*/) { emitter.emit("log", { logger: self, messageTokens: aFrom(arguments) }); }, this); }), @@ -43,7 +43,7 @@ var loggerPrototype = Object.create( Object.defineProperties(logger, { level: d("e", levelName), levelIndex: d("e", levelNames.indexOf(levelName)), - levelRoot: d("e", logger) + levelRoot: d("e", logger), }); levelLoggers[levelName] = logger; emitter.emit("init", { logger: logger }); @@ -56,7 +56,7 @@ var loggerPrototype = Object.create( return this.namespaceTokens.reduce(function (currentLogger, token) { return currentLogger._createNamespace(token); }, levelLogger); - }) + }), }, lazy( assign( @@ -72,14 +72,13 @@ var loggerPrototype = Object.create( { // Alias `warn` to `warning` warn: d(function () { return this._getLevelLogger("warning"); }, { - cacheName: "_warning" - }) + cacheName: "_warning", + }), } ) ), - namespaceProps, - enableDisableProps + namespaceProps, enableDisableProps ) ); diff --git a/lib/private/logger-prototype/namespace-props.js b/lib/private/logger-prototype/namespace-props.js index c30df2b..606743c 100644 --- a/lib/private/logger-prototype/namespace-props.js +++ b/lib/private/logger-prototype/namespace-props.js @@ -46,19 +46,19 @@ module.exports = assign( return this._childNamespaceLoggers[namespaceToken]; } var logger = Object.defineProperties(this._createLogger(), { - _namespaceToken: d("", namespaceToken) + _namespaceToken: d("", namespaceToken), }); this._childNamespaceLoggers[namespaceToken] = logger; emitter.emit("init", { logger: logger }); return logger; }), - _namespaceToken: d("", null) + _namespaceToken: d("", null), }, lazy({ // Full namespace string e.g. foo:bar:elo namespace: d("e", function () { return this.namespaceTokens.join(":") || null; }, { - cacheName: "_namespace" + cacheName: "_namespace", }), // All namespace tokens e.g. ["foo", "bar", "elo"] @@ -74,7 +74,7 @@ module.exports = assign( // Internal: Map of children namespace loggers _childNamespaceLoggers: d("", function () { return Object.create(null); }, { - cacheName: "__childNamespaceLoggers" - }) + cacheName: "__childNamespaceLoggers", + }), }) ); diff --git a/package.json b/package.json index 0cd6eed..35c51f4 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "lint-staged": "^15.2.10", "ncjsm": "^4.2.0", "nyc": "^17.1.0", - "prettier-elastic": "^2.2.1", + "prettier-elastic": "^3.2.5", "tape": "^5.3.1", "tape-index": "^3.2.0" }, diff --git a/test/ensure-logger.js b/test/ensure-logger.js index 7d6a01b..2915203 100644 --- a/test/ensure-logger.js +++ b/test/ensure-logger.js @@ -9,9 +9,7 @@ test("ensureLogger", function (t) { t.throws( function () { ensureLogger(function () { return "foo"; }); - }, - TypeError, - "Should throw on non logger values" + }, TypeError, "Should throw on non logger values" ); t.end(); }); diff --git a/test/index/04-events.js b/test/index/04-events.js index b3ed9f1..ffada2f 100644 --- a/test/index/04-events.js +++ b/test/index/04-events.js @@ -12,7 +12,7 @@ test("(main): Events", function (t) { [ require.resolve("../../"), require.resolve("../../lib/private/logger-prototype"), require.resolve("../../lib/emitter"), - require.resolve("../../lib/private/logger-prototype/namespace-props") + require.resolve("../../lib/private/logger-prototype/namespace-props"), ], function () { log = require("../.."); diff --git a/test/lib/abstract-writer/_resolve-uncached.js b/test/lib/abstract-writer/_resolve-uncached.js index cde1969..3df8d92 100644 --- a/test/lib/abstract-writer/_resolve-uncached.js +++ b/test/lib/abstract-writer/_resolve-uncached.js @@ -9,7 +9,7 @@ module.exports = function () { return { log: require("../../../"), LogWriter: require("../../../lib/abstract-writer"), - emitter: require("../../../lib/emitter") + emitter: require("../../../lib/emitter"), }; }); }; diff --git a/test/lib/get-master-writer.js b/test/lib/get-master-writer.js index fe043ef..f5ea6b2 100644 --- a/test/lib/get-master-writer.js +++ b/test/lib/get-master-writer.js @@ -10,12 +10,12 @@ test("lib/getMasterWriter", function (t) { require.resolve("../../lib/private/logger-prototype"), require.resolve("../../lib/private/logger-prototype/namespace-props"), require.resolve("../../lib/emitter"), require.resolve("../../lib/get-master-writer"), - require.resolve("../../lib/setup-visibility") + require.resolve("../../lib/setup-visibility"), ], function () { return { getMasterWriter: require("../../lib/get-master-writer"), - Writer: require("../../lib/abstract-writer") + Writer: require("../../lib/abstract-writer"), }; } ); diff --git a/test/lib/resolve-format-parts.js b/test/lib/resolve-format-parts.js index 13aece2..3e762b8 100644 --- a/test/lib/resolve-format-parts.js +++ b/test/lib/resolve-format-parts.js @@ -15,7 +15,7 @@ test("lib/resolveFormatParts", function (t) { t.deepEqual(normalizeParts(resolveFormatParts("foo bar %d %f", 20.2, 21.21)), { literals: ["foo bar ", " ", ""], substitutions: ["20.2", "21.21"], - rest: null + rest: null, }); t.end(); }); diff --git a/test/lib/setup-visibility/01-defaults.js b/test/lib/setup-visibility/01-defaults.js index 1b54ff8..38a351d 100644 --- a/test/lib/setup-visibility/01-defaults.js +++ b/test/lib/setup-visibility/01-defaults.js @@ -11,7 +11,7 @@ test("lib/setupVisibility: Defaults", function (t) { require.resolve("../../.."), require.resolve("../../../lib/emitter"), require.resolve("../../../lib/setup-visibility"), require.resolve("../../../lib/private/logger-prototype"), - require.resolve("../../../lib/private/logger-prototype/namespace-props") + require.resolve("../../../lib/private/logger-prototype/namespace-props"), ], function () { log = require("../../.."); diff --git a/test/lib/setup-visibility/02-existing.js b/test/lib/setup-visibility/02-existing.js index 7fa0491..526d8c8 100644 --- a/test/lib/setup-visibility/02-existing.js +++ b/test/lib/setup-visibility/02-existing.js @@ -11,7 +11,7 @@ test("lib/setupVisibility: Affects already created loggers", function (t) { require.resolve("../../.."), require.resolve("../../../lib/emitter"), require.resolve("../../../lib/setup-visibility"), require.resolve("../../../lib/private/logger-prototype"), - require.resolve("../../../lib/private/logger-prototype/namespace-props") + require.resolve("../../../lib/private/logger-prototype/namespace-props"), ], function () { log = require("../../.."); diff --git a/test/lib/setup-visibility/03-future.js b/test/lib/setup-visibility/03-future.js index d81ff9a..5bccef5 100644 --- a/test/lib/setup-visibility/03-future.js +++ b/test/lib/setup-visibility/03-future.js @@ -11,7 +11,7 @@ test("lib/setupVisibility: Affects loggers created later", function (t) { require.resolve("../../.."), require.resolve("../../../lib/emitter"), require.resolve("../../../lib/setup-visibility"), require.resolve("../../../lib/private/logger-prototype"), - require.resolve("../../../lib/private/logger-prototype/namespace-props") + require.resolve("../../../lib/private/logger-prototype/namespace-props"), ], function () { log = require("../../.."); diff --git a/test/lib/setup-visibility/04-star.js b/test/lib/setup-visibility/04-star.js index 019d319..4ab7527 100644 --- a/test/lib/setup-visibility/04-star.js +++ b/test/lib/setup-visibility/04-star.js @@ -11,7 +11,7 @@ test("lib/setupVisibility: Global '*' enables all debug logs", function (t) { require.resolve("../../.."), require.resolve("../../../lib/emitter"), require.resolve("../../../lib/setup-visibility"), require.resolve("../../../lib/private/logger-prototype"), - require.resolve("../../../lib/private/logger-prototype/namespace-props") + require.resolve("../../../lib/private/logger-prototype/namespace-props"), ], function () { log = require("../../..");