Skip to content

Commit 7de186a

Browse files
dependabot[bot]deekshas8cloud-sdk-js
authored
chore(deps): bump logform from 2.6.1 to 2.7.0 (#5161)
* chore(deps): bump logform from 2.6.1 to 2.7.0 Bumps [logform](https://github.com/winstonjs/logform) from 2.6.1 to 2.7.0. - [Release notes](https://github.com/winstonjs/logform/releases) - [Changelog](https://github.com/winstonjs/logform/blob/master/CHANGELOG.md) - [Commits](winstonjs/logform@v2.6.1...v2.7.0) --- updated-dependencies: - dependency-name: logform dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * chore(deps): bump logform from 2.6.1 to 2.7.0 Bumps [logform](https://github.com/winstonjs/logform) from 2.6.1 to 2.7.0. - [Release notes](https://github.com/winstonjs/logform/releases) - [Changelog](https://github.com/winstonjs/logform/blob/master/CHANGELOG.md) - [Commits](winstonjs/logform@v2.6.1...v2.7.0) --- updated-dependencies: - dependency-name: logform dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * try * Changes from lint:fix * stricter type check * Changes from lint:fix --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: deekshas8 <[email protected]> Co-authored-by: Deeksha Sinha <[email protected]> Co-authored-by: cloud-sdk-js <[email protected]>
1 parent aaba0f7 commit 7de186a

File tree

5 files changed

+44
-16
lines changed

5 files changed

+44
-16
lines changed

.github/actions/changesets-fixed-version-bump/index.js

Lines changed: 18 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/util/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"dependencies": {
3737
"axios": "^1.7.7",
3838
"chalk": "^4.1.0",
39-
"logform": "^2.6.0",
39+
"logform": "^2.7.0",
4040
"voca": "^1.4.1",
4141
"winston": "^3.15.0",
4242
"winston-transport": "^4.8.0"

packages/util/src/logger/format/kibana.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function kibanaTransformer(info: TransformableInfo): TransformableInfo {
1818
return {
1919
...info,
2020
msg: getMessageOrStack(info),
21-
written_ts: new Date(info.timestamp).getTime(),
21+
written_ts: new Date(info.timestamp as string).getTime(),
2222
written_at: info.timestamp
2323
};
2424
}

packages/util/src/logger/format/local.ts

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import chalk from 'chalk';
22
import { format } from 'winston';
3+
import { isNullish } from '../../nullish';
34
import type { TransformableInfo } from 'logform';
45

56
const { combine, timestamp, cli, printf, errors } = format;
@@ -12,14 +13,19 @@ export const local = combine(
1213
timestamp(),
1314
format(localTransformer)(),
1415
cli(),
15-
printf(info => {
16+
printf((info: TransformableInfo) => {
17+
// Ensure custom_fields is an object and has messageContext
1618
const messageContext =
17-
info.custom_fields && info.custom_fields.messageContext
19+
info.custom_fields &&
20+
typeof info.custom_fields === 'object' &&
21+
'messageContext' in info.custom_fields
1822
? `${chalk.blue(`(${info.custom_fields.messageContext})`)}: `
1923
: '';
20-
const trimmedMessage = info.message.replace(/^\s*/, '');
24+
// Type guard to ensure message is a string
25+
const message = typeof info.message === 'string' ? info.message : '';
26+
const trimmedMessage = message.replace(/^\s*/, '');
2127
const paddingLength =
22-
info.message.length - trimmedMessage.length + messageContext.length;
28+
message.length - trimmedMessage.length + messageContext.length;
2329
if (info.error) {
2430
info.level = chalk.inverse(info.level);
2531
}
@@ -35,7 +41,16 @@ export const local = combine(
3541
* @internal
3642
*/
3743
export function getMessageOrStack(info: TransformableInfo): string {
38-
return info.stack && info.level === 'error' ? info.stack : info.message;
44+
const isString = (value: unknown): value is string =>
45+
typeof value === 'string';
46+
47+
return !isNullish(info.stack) &&
48+
isString(info.stack) &&
49+
info.level === 'error'
50+
? info.stack
51+
: !isNullish(info.message) && isString(info.message)
52+
? info.message
53+
: '';
3954
}
4055

4156
function localTransformer(info: TransformableInfo): TransformableInfo {

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6382,10 +6382,10 @@ log-symbols@^4.0.0, log-symbols@^4.1.0:
63826382
chalk "^4.1.0"
63836383
is-unicode-supported "^0.1.0"
63846384

6385-
logform@^2.6.0, logform@^2.6.1:
6386-
version "2.6.1"
6387-
resolved "https://registry.npmjs.org/logform/-/logform-2.6.1.tgz#71403a7d8cae04b2b734147963236205db9b3df0"
6388-
integrity sha512-CdaO738xRapbKIMVn2m4F6KTj4j7ooJ8POVnebSgKo3KBz5axNXRAL7ZdRjIV6NOr2Uf4vjtRkxrFETOioCqSA==
6385+
logform@^2.6.0, logform@^2.6.1, logform@^2.7.0:
6386+
version "2.7.0"
6387+
resolved "https://registry.npmjs.org/logform/-/logform-2.7.0.tgz#cfca97528ef290f2e125a08396805002b2d060d1"
6388+
integrity sha512-TFYA4jnP7PVbmlBIfhlSe+WKxs9dklXMTEGcBCIvLhE/Tn3H6Gk1norupVW7m5Cnd4bLcr08AytbyV/xj7f/kQ==
63896389
dependencies:
63906390
"@colors/colors" "1.6.0"
63916391
"@types/triple-beam" "^1.3.2"

0 commit comments

Comments
 (0)