Skip to content

Commit

Permalink
refactor: Upgrade prettier-elastic to v3
Browse files Browse the repository at this point in the history
  • Loading branch information
medikoo committed Sep 24, 2024
1 parent 6007843 commit acd53a0
Show file tree
Hide file tree
Showing 17 changed files with 32 additions and 35 deletions.
6 changes: 3 additions & 3 deletions commitlint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
],
},
};
4 changes: 2 additions & 2 deletions lib/abstract-writer.js
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down Expand Up @@ -77,7 +77,7 @@ Object.defineProperties(
}),
setupLevelMessagePrefix: d(function (logger) {
logger.levelMessagePrefix = this.constructor.levelPrefixes[logger.level];
})
}),
},
resolveMessageProperties
)
Expand Down
2 changes: 1 addition & 1 deletion lib/printf-modifiers.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ module.exports = {
.map(function (arg) { return isObject(arg) ? jsonModifier(arg) : stringModifier(arg); })
.join(" ");
return str;
}
},
};
4 changes: 2 additions & 2 deletions lib/private/abstract-writer/resolve-message-properties.js
Original file line number Diff line number Diff line change
Expand Up @@ -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!"); }),
};
4 changes: 2 additions & 2 deletions lib/private/logger-prototype/enable-disable-props.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module.exports = {
else delete data.logger.isEnabled;
});
result.restore = noop;
}
},
};
return result;
}),
Expand All @@ -36,5 +36,5 @@ module.exports = {
objForEach(this._childNamespaceLoggers, function (namespacedLogger) {
namespacedLogger._setEnabledStateRecursively(newState, cache);
});
})
}),
};
13 changes: 6 additions & 7 deletions lib/private/logger-prototype/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}),
Expand All @@ -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 });
Expand All @@ -56,7 +56,7 @@ var loggerPrototype = Object.create(
return this.namespaceTokens.reduce(function (currentLogger, token) {
return currentLogger._createNamespace(token);
}, levelLogger);
})
}),
},
lazy(
assign(
Expand All @@ -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
)
);

Expand Down
10 changes: 5 additions & 5 deletions lib/private/logger-prototype/namespace-props.js
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -74,7 +74,7 @@ module.exports = assign(

// Internal: Map of children namespace loggers
_childNamespaceLoggers: d("", function () { return Object.create(null); }, {
cacheName: "__childNamespaceLoggers"
})
cacheName: "__childNamespaceLoggers",
}),
})
);
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
4 changes: 1 addition & 3 deletions test/ensure-logger.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
2 changes: 1 addition & 1 deletion test/index/04-events.js
Original file line number Diff line number Diff line change
Expand Up @@ -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("../..");
Expand Down
2 changes: 1 addition & 1 deletion test/lib/abstract-writer/_resolve-uncached.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = function () {
return {
log: require("../../../"),
LogWriter: require("../../../lib/abstract-writer"),
emitter: require("../../../lib/emitter")
emitter: require("../../../lib/emitter"),
};
});
};
4 changes: 2 additions & 2 deletions test/lib/get-master-writer.js
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
};
}
);
Expand Down
2 changes: 1 addition & 1 deletion test/lib/resolve-format-parts.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
Expand Down
2 changes: 1 addition & 1 deletion test/lib/setup-visibility/01-defaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -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("../../..");
Expand Down
2 changes: 1 addition & 1 deletion test/lib/setup-visibility/02-existing.js
Original file line number Diff line number Diff line change
Expand Up @@ -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("../../..");
Expand Down
2 changes: 1 addition & 1 deletion test/lib/setup-visibility/03-future.js
Original file line number Diff line number Diff line change
Expand Up @@ -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("../../..");
Expand Down
2 changes: 1 addition & 1 deletion test/lib/setup-visibility/04-star.js
Original file line number Diff line number Diff line change
Expand Up @@ -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("../../..");
Expand Down

0 comments on commit acd53a0

Please sign in to comment.