From ab2e33c734ffe749fa12b43ffdae936ec246f155 Mon Sep 17 00:00:00 2001 From: danielpeintner Date: Tue, 7 Oct 2025 17:59:32 +0200 Subject: [PATCH] refactor: activate eslint typescript-eslint/prefer-nullish-coalescing --- eslint.config.mjs | 2 +- packages/binding-coap/src/coap-server.ts | 4 +--- packages/binding-http/src/http-client-impl.ts | 2 +- packages/binding-http/src/http-server.ts | 4 +--- packages/binding-modbus/src/modbus-client.ts | 8 +++----- packages/binding-opcua/src/opcua-protocol-client.ts | 4 +--- 6 files changed, 8 insertions(+), 16 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 752c49bbd..d32a3e8fa 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -122,7 +122,7 @@ export default defineConfig([ "@typescript-eslint/no-unused-vars": "off", "@typescript-eslint/no-unused-expressions": "off", "@typescript-eslint/no-require-imports": "off", // https://github.com/eclipse-thingweb/node-wot/issues/1430 - "@typescript-eslint/prefer-nullish-coalescing": "off", // https://github.com/eclipse-thingweb/node-wot/issues/1430 + "@typescript-eslint/prefer-nullish-coalescing": "error", "@typescript-eslint/no-empty-object-type": "off", // https://github.com/eclipse-thingweb/node-wot/issues/1430 "@typescript-eslint/no-floating-promises": "off", // https://github.com/eclipse-thingweb/node-wot/issues/1430 diff --git a/packages/binding-coap/src/coap-server.ts b/packages/binding-coap/src/coap-server.ts index bcebb179d..d31acfa72 100644 --- a/packages/binding-coap/src/coap-server.ts +++ b/packages/binding-coap/src/coap-server.ts @@ -201,9 +201,7 @@ export default class CoapServer implements ProtocolServer { return; } - if (thing.forms == null) { - thing.forms = []; - } + thing.forms ??= []; const form = this.createAffordanceForm(base, this.PROPERTY_DIR, offeredMediaType, opValues, thing.uriVariables); diff --git a/packages/binding-http/src/http-client-impl.ts b/packages/binding-http/src/http-client-impl.ts index 3344c4afa..584badd64 100644 --- a/packages/binding-http/src/http-client-impl.ts +++ b/packages/binding-http/src/http-client-impl.ts @@ -356,7 +356,7 @@ export default class HttpClient implements ProtocolClient { const url = HttpClient.fixLocalhostName(form.href); - requestInit.method = form["htv:methodName"] ? form["htv:methodName"] : defaultMethod; + requestInit.method = form["htv:methodName"] ?? defaultMethod; requestInit.headers = requestInit.headers ?? []; requestInit.headers = requestInit.headers as string[][]; diff --git a/packages/binding-http/src/http-server.ts b/packages/binding-http/src/http-server.ts index 83159b2f9..4a46e529e 100644 --- a/packages/binding-http/src/http-server.ts +++ b/packages/binding-http/src/http-server.ts @@ -369,9 +369,7 @@ export default class HttpServer implements ProtocolServer { "writemultipleproperties", ]; } - if (thing.forms == null) { - thing.forms = []; - } + thing.forms ??= []; thing.forms.push(form); this.addUrlRewriteEndpoints(form, thing.forms); } diff --git a/packages/binding-modbus/src/modbus-client.ts b/packages/binding-modbus/src/modbus-client.ts index ad06f03a8..017fbf49f 100644 --- a/packages/binding-modbus/src/modbus-client.ts +++ b/packages/binding-modbus/src/modbus-client.ts @@ -39,11 +39,9 @@ class ModbusSubscription { error?: (error: Error) => void, complete?: () => void ) { - if (!complete) { - complete = () => { - // do nothing. - }; - } + complete ??= () => { + // do nothing. + }; this.interval = global.setInterval(async () => { try { const result = await client.readResource(form); diff --git a/packages/binding-opcua/src/opcua-protocol-client.ts b/packages/binding-opcua/src/opcua-protocol-client.ts index 08bb99278..60afb8745 100644 --- a/packages/binding-opcua/src/opcua-protocol-client.ts +++ b/packages/binding-opcua/src/opcua-protocol-client.ts @@ -257,9 +257,7 @@ export class OPCUAProtocolClient implements ProtocolClient { private async _getNamespaceArray(form: OPCUAForm): Promise { return this._withConnection(form, async (c: OPCUAConnection) => { - if (!c.namespaceArray) { - c.namespaceArray = await readNamespaceArray(c.session); - } + c.namespaceArray ??= await readNamespaceArray(c.session); return c.namespaceArray; }); }