From 2e13588cd887acefbf1cbe6e21e98cf71b24e47a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kiss=20R=C3=B3bert?= Date: Wed, 8 Jul 2026 17:51:45 +0200 Subject: [PATCH] style: allow no-case-declarations eslint rule --- eslint.config.mjs | 1 - packages/mcumgr/src/util/cbor.ts | 40 ++++++++++++++----- .../uhk-agent/src/services/sudo.service.ts | 9 +++-- .../tab/mouse/macro-mouse.component.ts | 12 ++++-- 4 files changed, 43 insertions(+), 19 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index ce32f35e1d0..11ad278b01c 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -27,7 +27,6 @@ export const typescriptRules = { '@typescript-eslint/prefer-promise-reject-errors': 'off', '@typescript-eslint/restrict-template-expressions': 'off', '@typescript-eslint/unbound-method': 'off', - 'no-case-declarations': 'off', 'no-prototype-builtins': 'off', 'preserve-caught-error': 'off', } diff --git a/packages/mcumgr/src/util/cbor.ts b/packages/mcumgr/src/util/cbor.ts index cb96b18cecc..d57975d04d8 100644 --- a/packages/mcumgr/src/util/cbor.ts +++ b/packages/mcumgr/src/util/cbor.ts @@ -96,7 +96,7 @@ export function encode(value: unknown) { return writeUint8(0xf7); switch (typeof value) { - case "number": + case "number": { if (Math.floor(value) === value) { if (0 <= value && value <= POW_2_53) return writeTypeAndLength(0, value); @@ -105,8 +105,9 @@ export function encode(value: unknown) { } writeUint8(0xfb); return writeFloat64(value); + } - case "string": + case "string": { const utf8data = []; for (i = 0; i < value.length; ++i) { let charCode = value.charCodeAt(i); @@ -133,8 +134,9 @@ export function encode(value: unknown) { writeTypeAndLength(3, utf8data.length); return writeUint8Array(utf8data); + } - default: + default: { let length; if (Array.isArray(value)) { length = value.length; @@ -154,6 +156,7 @@ export function encode(value: unknown) { encodeItem(value[key]); } } + } } } @@ -308,11 +311,15 @@ export function decode(data: ArrayBuffer | SharedArrayBuffer, tagger?: Function, throw "Invalid length"; switch (majorType) { - case 0: + case 0: { return length; - case 1: + } + + case 1: { return -1 - length; - case 2: + } + + case 2: { if (length < 0) { const elements = []; let fullArrayLength = 0; @@ -329,7 +336,9 @@ export function decode(data: ArrayBuffer | SharedArrayBuffer, tagger?: Function, return fullArray; } return readArrayBuffer(length); - case 3: + } + + case 3: { const utf16data = []; if (length < 0) { while ((length = readIndefiniteStringLength(majorType)) >= 0) @@ -337,7 +346,9 @@ export function decode(data: ArrayBuffer | SharedArrayBuffer, tagger?: Function, } else appendUtf16Data(utf16data, length); return String.fromCharCode.apply(null, utf16data); - case 4: + } + + case 4: { let retArray; if (length < 0) { retArray = []; @@ -349,16 +360,22 @@ export function decode(data: ArrayBuffer | SharedArrayBuffer, tagger?: Function, retArray[i] = decodeItem(); } return retArray; - case 5: + } + + case 5: { const retObject = {}; for (i = 0; i < length || length < 0 && !readBreak(); ++i) { const key = decodeItem(); retObject[key] = decodeItem(); } return retObject; - case 6: + } + + case 6: { return tagger(decodeItem(), length); - case 7: + } + + case 7: { switch (length) { case 20: return false; @@ -371,6 +388,7 @@ export function decode(data: ArrayBuffer | SharedArrayBuffer, tagger?: Function, default: return simpleValue(length); } + } } } diff --git a/packages/uhk-agent/src/services/sudo.service.ts b/packages/uhk-agent/src/services/sudo.service.ts index 568245315fc..f5a44f61e59 100644 --- a/packages/uhk-agent/src/services/sudo.service.ts +++ b/packages/uhk-agent/src/services/sudo.service.ts @@ -33,17 +33,20 @@ export class SudoService { } switch (process.platform) { - case 'linux': + case 'linux': { await this.setPrivilegeOnLinux(event); break; - default: + } + + default: { const response: IpcResponse = { success: false, - error: {message: 'Permissions couldn\'t be set. Invalid platform: ' + process.platform} + error: { message: 'Permissions couldn\'t be set. Invalid platform: ' + process.platform } }; event.sender.send(IpcEvents.device.setPrivilegeOnLinuxReply, response); break; + } } } diff --git a/packages/uhk-web/src/app/components/macro/action-editor/tab/mouse/macro-mouse.component.ts b/packages/uhk-web/src/app/components/macro/action-editor/tab/mouse/macro-mouse.component.ts index fc20eecf49d..96e7fac2ea4 100644 --- a/packages/uhk-web/src/app/components/macro/action-editor/tab/mouse/macro-mouse.component.ts +++ b/packages/uhk-web/src/app/components/macro/action-editor/tab/mouse/macro-mouse.component.ts @@ -134,13 +134,17 @@ export class MacroMouseTabComponent extends MacroBaseComponent implements OnInit isMacroValid = () => { switch (this.macroAction.constructor) { case MoveMouseMacroAction: - case ScrollMouseMacroAction: - const {x, y} = this.macroAction as MoveMouseMacroAction; + case ScrollMouseMacroAction: { + const { x, y } = this.macroAction as MoveMouseMacroAction; return x !== undefined && x !== null && y !== undefined && y !== null && (x !== 0 || y !== 0) && x < 10000 && x > -10000 && y < 10000 && y > -10000; - case MouseButtonMacroAction: - const {mouseButtonsMask} = this.macroAction as MouseButtonMacroAction; + } + + case MouseButtonMacroAction: { + const { mouseButtonsMask } = this.macroAction as MouseButtonMacroAction; return !!mouseButtonsMask; + } + default: return true; }