Skip to content

Commit f8b31cb

Browse files
susnuxsusnux
committed
chore: apply auto-fixable patches by ESLint
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
1 parent 6392fb8 commit f8b31cb

5 files changed

Lines changed: 60 additions & 49 deletions

File tree

‎lib/ConsoleLogger.ts‎

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,37 @@
22
* SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
33
* SPDX-License-Identifier: GPL-3.0-or-later
44
*/
5-
import { IContext, ILogger, LogLevel } from './contracts'
65

7-
export class ConsoleLogger implements ILogger {
6+
import type { IContext, ILogger } from './contracts'
7+
8+
import { LogLevel } from './contracts'
89

10+
export class ConsoleLogger implements ILogger {
911
private context: IContext
1012

1113
constructor(context?: IContext) {
1214
this.context = context || {}
1315
}
1416

15-
private formatMessage(message: string|Error, level: LogLevel, context?: IContext): string {
17+
private formatMessage(message: string | Error, level: LogLevel, context?: IContext): string {
1618
let msg = '[' + LogLevel[level].toUpperCase() + '] '
1719

1820
if (context && context.app) {
1921
msg += context.app + ': '
2022
}
2123

22-
if (typeof message === 'string') return msg + message
24+
if (typeof message === 'string') { return msg + message }
2325

2426
// basic error formatting
2527
msg += `Unexpected ${message.name}`
26-
if (message.message) msg += ` "${message.message}"`
28+
if (message.message) { msg += ` "${message.message}"` }
2729
// only add stack trace when debugging
28-
if (level === LogLevel.Debug && message.stack) msg += `\n\nStack trace:\n${message.stack}`
30+
if (level === LogLevel.Debug && message.stack) { msg += `\n\nStack trace:\n${message.stack}` }
2931

3032
return msg
3133
}
3234

33-
log(level: LogLevel, message: string|Error, context: IContext) {
35+
log(level: LogLevel, message: string | Error, context: IContext) {
3436
// Skip if level is configured and this is below the level
3537
if (typeof this.context?.level === 'number' && level < this.context?.level) {
3638
return
@@ -42,45 +44,44 @@ export class ConsoleLogger implements ILogger {
4244
}
4345

4446
switch (level) {
45-
case LogLevel.Debug:
46-
console.debug(this.formatMessage(message, LogLevel.Debug, context), context)
47-
break
48-
case LogLevel.Info:
49-
console.info(this.formatMessage(message, LogLevel.Info, context), context)
50-
break
51-
case LogLevel.Warn:
52-
console.warn(this.formatMessage(message, LogLevel.Warn, context), context)
53-
break
54-
case LogLevel.Error:
55-
console.error(this.formatMessage(message, LogLevel.Error, context), context)
56-
break
57-
case LogLevel.Fatal:
58-
default:
59-
console.error(this.formatMessage(message, LogLevel.Fatal, context), context)
60-
break
47+
case LogLevel.Debug:
48+
console.debug(this.formatMessage(message, LogLevel.Debug, context), context)
49+
break
50+
case LogLevel.Info:
51+
console.info(this.formatMessage(message, LogLevel.Info, context), context)
52+
break
53+
case LogLevel.Warn:
54+
console.warn(this.formatMessage(message, LogLevel.Warn, context), context)
55+
break
56+
case LogLevel.Error:
57+
console.error(this.formatMessage(message, LogLevel.Error, context), context)
58+
break
59+
case LogLevel.Fatal:
60+
default:
61+
console.error(this.formatMessage(message, LogLevel.Fatal, context), context)
62+
break
6163
}
6264
}
6365

64-
debug(message: string|Error, context?: IContext): void {
65-
this.log(LogLevel.Debug, message, Object.assign({}, this.context, context))
66+
debug(message: string | Error, context?: IContext): void {
67+
this.log(LogLevel.Debug, message, { ...this.context, ...context })
6668
}
6769

68-
info(message: string|Error, context?: IContext): void {
69-
this.log(LogLevel.Info, message, Object.assign({}, this.context, context))
70+
info(message: string | Error, context?: IContext): void {
71+
this.log(LogLevel.Info, message, { ...this.context, ...context })
7072
}
7173

72-
warn(message: string|Error, context?: IContext): void {
73-
this.log(LogLevel.Warn, message, Object.assign({}, this.context, context))
74+
warn(message: string | Error, context?: IContext): void {
75+
this.log(LogLevel.Warn, message, { ...this.context, ...context })
7476
}
7577

76-
error(message: string|Error, context?: IContext): void {
77-
this.log(LogLevel.Error, message, Object.assign({}, this.context, context))
78+
error(message: string | Error, context?: IContext): void {
79+
this.log(LogLevel.Error, message, { ...this.context, ...context })
7880
}
7981

80-
fatal(message: string|Error, context?: IContext): void {
81-
this.log(LogLevel.Fatal, message, Object.assign({}, this.context, context))
82+
fatal(message: string | Error, context?: IContext): void {
83+
this.log(LogLevel.Fatal, message, { ...this.context, ...context })
8284
}
83-
8485
}
8586

8687
/**

‎lib/LoggerBuilder.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22
* SPDX-FileCopyrightText: 2020-2024 Nextcloud GmbH and Nextcloud contributors
33
* SPDX-License-Identifier: GPL-3.0-or-later
44
*/
5+
6+
import type { IContext, ILogger, ILoggerFactory } from './contracts'
7+
58
import { getCurrentUser } from '@nextcloud/auth'
6-
import { IContext, ILogger, ILoggerFactory, LogLevel } from './contracts'
9+
import { LogLevel } from './contracts'
710

811
/**
912
* @notExported
1013
*/
1114
export class LoggerBuilder {
12-
1315
protected context: IContext
1416

1517
protected factory: ILoggerFactory
@@ -39,13 +41,13 @@ export class LoggerBuilder {
3941
return this
4042
}
4143

42-
/* eslint-disable jsdoc/no-undefined-types */
4344
/**
4445
* Set the user id within the logging context
46+
*
4547
* @param uid User ID
4648
* @see {@link detectUser}
4749
*/
48-
/* eslint-enable jsdoc/no-undefined-types */
50+
4951
setUid(uid: string): LoggerBuilder {
5052
this.context.uid = uid
5153
return this
@@ -95,5 +97,4 @@ export class LoggerBuilder {
9597

9698
return this.factory(this.context)
9799
}
98-
99100
}

‎lib/global.d.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
* SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
33
* SPDX-License-Identifier: GPL-3.0-or-later or LGPL-3.0-or-later
44
*/
5+
56
import type { LogLevel } from './contracts'
67

78
declare global {
89
interface Window {
910
_oc_config: {
10-
loglevel: LogLevel,
11-
},
12-
_oc_debug: boolean,
11+
loglevel: LogLevel
12+
}
13+
_oc_debug: boolean
1314
}
1415
}
1516

‎lib/index.ts‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
* SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors
33
* SPDX-License-Identifier: GPL-3.0-or-later
44
*/
5+
6+
import type { ILogger } from './contracts'
7+
58
import { buildConsoleLogger } from './ConsoleLogger'
6-
import { ILogger } from './contracts'
79
import { LoggerBuilder } from './LoggerBuilder'
810

911
/**
@@ -21,4 +23,8 @@ export function getLogger(): ILogger {
2123
}
2224

2325
export { type LoggerBuilder }
24-
export { LogLevel, type ILogger, type ILoggerFactory } from './contracts'
26+
export {
27+
type ILogger, type ILoggerFactory,
28+
29+
LogLevel,
30+
} from './contracts'

‎package.json‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,13 @@
6262
"node": "^20.0.0 || ^22.0.0 || ^24.0.0"
6363
},
6464
"devEngines": {
65-
"packageManager": [{
66-
"name": "npm",
67-
"version": "^11.3.0",
68-
"onFail": "error"
69-
}],
65+
"packageManager": [
66+
{
67+
"name": "npm",
68+
"version": "^11.3.0",
69+
"onFail": "error"
70+
}
71+
],
7072
"runtime": {
7173
"name": "node",
7274
"version": "^24.0.0",

0 commit comments

Comments
 (0)