refactor: eliminate Object.entries polyfill

packages/cc/src/cc/ColorSwitchCC.ts

@@ -20,7 +20,6 @@ import type { ZWaveApplicationHost, ZWaveHost } from "@zwave-js/host/safe";
 import { getEnumMemberName, keysOf, pick } from "@zwave-js/shared/safe";
 import { validateArgs } from "@zwave-js/transformers";
 import { clamp } from "alcalzone-shared/math";
-import { entries } from "alcalzone-shared/objects";
 import { isObject } from "alcalzone-shared/typeguards";
 import {
 	CCAPI,
@@ -273,7 +272,7 @@ export class ColorSwitchCCAPI extends CCAPI {
 				targetColorValueId,
 			) ?? {};
 
-		for (const [key, value] of entries(colorTable)) {
+		for (const [key, value] of Object.entries(colorTable)) {
 			const component = colorTableKeyToComponent(key);
 			if (
 				component === ColorComponent.Red ||
@@ -421,7 +420,7 @@ export class ColorSwitchCCAPI extends CCAPI {
 				}
 
 				// Ensure that each property is numeric
-				for (const [key, val] of entries(value)) {
+				for (const [key, val] of Object.entries(value)) {
 					if (typeof val !== "number") {
 						throwWrongValueType(
 							this.ccId,
@@ -901,7 +900,7 @@ export class ColorSwitchCCSet extends ColorSwitchCC {
 		);
 		this.payload[0] = populatedColorCount & 0b11111;
 		let i = 1;
-		for (const [key, value] of entries(this.colorTable)) {
+		for (const [key, value] of Object.entries(this.colorTable)) {
 			const component = colorTableKeyToComponent(key);
 			this.payload[i] = component;
 			this.payload[i + 1] = clamp(value, 0, 0xff);

packages/cc/src/lib/serializers.ts

@@ -1,6 +1,5 @@
 import { ZWaveError, ZWaveErrorCodes } from "@zwave-js/core";
 import { clamp } from "alcalzone-shared/math";
-import { entries } from "alcalzone-shared/objects";
 import type { SetbackSpecialState, SetbackState, Switchpoint } from "./_Types";
 
 export const setbackSpecialStateValues: Record<SetbackSpecialState, number> = {
@@ -26,7 +25,7 @@ export function encodeSetbackState(state: SetbackState): number {
 export function decodeSetbackState(val: number): SetbackState | undefined {
 	if (val > 120) {
 		// Special state, try to look it up
-		const foundEntry = entries(setbackSpecialStateValues).find(
+		const foundEntry = Object.entries(setbackSpecialStateValues).find(
 			([, v]) => val === v,
 		);
 		if (!foundEntry) return;

packages/config/src/ConfigManager.ts

@@ -5,7 +5,6 @@ import {
 	ZWaveLogContainer,
 } from "@zwave-js/core";
 import { getErrorMessage, JSONObject, num2hex } from "@zwave-js/shared";
-import { entries } from "alcalzone-shared/objects";
 import { isObject } from "alcalzone-shared/typeguards";
 import { pathExists, readFile } from "fs-extra";
 import JSON5 from "json5";
@@ -792,19 +791,27 @@ export async function loadDeviceClassesInternal(
 		}
 
 		const basicDeviceClasses = new Map<number, string>();
-		for (const [key, basicClass] of entries(definition.basic)) {
+		for (const [key, basicClass] of Object.entries(definition.basic)) {
 			if (!hexKeyRegexNDigits.test(key)) {
 				throwInvalidConfig(
 					"device classes",
 					`found invalid key "${key}" in the basic device class definition. Device classes must have lowercase hexadecimal IDs.`,
 				);
 			}
+			if (typeof basicClass !== "string") {
+				throwInvalidConfig(
+					"device classes",
+					`basic device class "${key}" must be a string`,
+				);
+			}
 			const keyNum = parseInt(key.slice(2), 16);
 			basicDeviceClasses.set(keyNum, basicClass);
 		}
 
 		const genericDeviceClasses = new Map<number, GenericDeviceClass>();
-		for (const [key, genericDefinition] of entries(definition.generic)) {
+		for (const [key, genericDefinition] of Object.entries(
+			definition.generic,
+		)) {
 			if (!hexKeyRegexNDigits.test(key)) {
 				throwInvalidConfig(
 					"device classes",
@@ -814,7 +821,7 @@ export async function loadDeviceClassesInternal(
 			const keyNum = parseInt(key.slice(2), 16);
 			genericDeviceClasses.set(
 				keyNum,
-				new GenericDeviceClass(keyNum, genericDefinition),
+				new GenericDeviceClass(keyNum, genericDefinition as any),
 			);
 		}
 
@@ -867,27 +874,38 @@ export async function loadIndicatorsInternal(
 		}
 
 		const indicators = new Map<number, string>();
-		for (const [id, label] of entries(definition.indicators)) {
+		for (const [id, label] of Object.entries(definition.indicators)) {
 			if (!hexKeyRegexNDigits.test(id)) {
 				throwInvalidConfig(
 					"indicators",
 					`found invalid key "${id}" in "indicators". Indicators must have lowercase hexadecimal IDs.`,
 				);
 			}
+			if (typeof label !== "string") {
+				throwInvalidConfig(
+					"indicators",
+					`indicator "${id}" must be a string`,
+				);
+			}
 			const idNum = parseInt(id.slice(2), 16);
 			indicators.set(idNum, label);
 		}
 
 		const properties = new Map<number, IndicatorProperty>();
-		for (const [id, propDefinition] of entries(definition.properties)) {
+		for (const [id, propDefinition] of Object.entries(
+			definition.properties,
+		)) {
 			if (!hexKeyRegexNDigits.test(id)) {
 				throwInvalidConfig(
 					"indicators",
 					`found invalid key "${id}" in "properties". Indicator properties must have lowercase hexadecimal IDs.`,
 				);
 			}
 			const idNum = parseInt(id.slice(2), 16);
-			properties.set(idNum, new IndicatorProperty(idNum, propDefinition));
+			properties.set(
+				idNum,
+				new IndicatorProperty(idNum, propDefinition as any),
+			);
 		}
 
 		return { indicators, properties };
@@ -924,7 +942,7 @@ export async function loadMetersInternal(
 		}
 
 		const meters = new Map();
-		for (const [id, meterDefinition] of entries(definition)) {
+		for (const [id, meterDefinition] of Object.entries(definition)) {
 			if (!hexKeyRegexNDigits.test(id)) {
 				throwInvalidConfig(
 					"meters",
@@ -971,7 +989,7 @@ export async function loadNotificationsInternal(
 		}
 
 		const notifications = new Map();
-		for (const [id, ntfcnDefinition] of entries(definition)) {
+		for (const [id, ntfcnDefinition] of Object.entries(definition)) {
 			if (!hexKeyRegexNDigits.test(id)) {
 				throwInvalidConfig(
 					"notifications",
@@ -1021,7 +1039,7 @@ export async function loadNamedScalesInternal(
 		}
 
 		const namedScales = new Map<string, ScaleGroup>();
-		for (const [name, scales] of entries(definition)) {
+		for (const [name, scales] of Object.entries(definition)) {
 			if (!/[\w\d]+/.test(name)) {
 				throwInvalidConfig(
 					"named scales",
@@ -1033,7 +1051,7 @@ export async function loadNamedScalesInternal(
 				Scale
 			>();
 			named.name = name;
-			for (const [key, scaleDefinition] of entries(
+			for (const [key, scaleDefinition] of Object.entries(
 				scales as JSONObject,
 			)) {
 				if (!hexKeyRegexNDigits.test(key)) {
@@ -1085,7 +1103,7 @@ export async function loadSensorTypesInternal(
 		}
 
 		const sensorTypes = new Map();
-		for (const [key, sensorDefinition] of entries(definition)) {
+		for (const [key, sensorDefinition] of Object.entries(definition)) {
 			if (!hexKeyRegexNDigits.test(key)) {
 				throwInvalidConfig(
 					"sensor types",

packages/config/src/DeviceClasses.ts

@@ -1,7 +1,6 @@
 import { CommandClasses } from "@zwave-js/core/safe";
 import { JSONObject, num2hex } from "@zwave-js/shared/safe";
 import { distinct } from "alcalzone-shared/arrays";
-import { entries } from "alcalzone-shared/objects";
 import { isArray, isObject } from "alcalzone-shared/typeguards";
 import { hexKeyRegexNDigits, throwInvalidConfig } from "./utils_safe";
 
@@ -144,7 +143,7 @@ export class GenericDeviceClass {
 
 		const specific = new Map<number, SpecificDeviceClass>();
 		if (isObject(definition.specific)) {
-			for (const [specificKey, specificDefinition] of entries(
+			for (const [specificKey, specificDefinition] of Object.entries(
 				definition.specific,
 			)) {
 				if (!hexKeyRegexNDigits.test(specificKey))
@@ -161,7 +160,7 @@ export class GenericDeviceClass {
 					specificKeyNum,
 					new SpecificDeviceClass(
 						specificKeyNum,
-						specificDefinition,
+						specificDefinition as any,
 						this,
 					),
 				);

packages/config/src/Manufacturers.ts

@@ -1,6 +1,5 @@
 import { isZWaveError, ZWaveError, ZWaveErrorCodes } from "@zwave-js/core";
 import { formatId, stringify } from "@zwave-js/shared";
-import { entries } from "alcalzone-shared/objects";
 import { isObject } from "alcalzone-shared/typeguards";
 import { pathExists, readFile, writeFile } from "fs-extra";
 import JSON5 from "json5";
@@ -36,7 +35,7 @@ export async function loadManufacturersInternal(
 		}
 
 		const manufacturers = new Map();
-		for (const [id, name] of entries(definition)) {
+		for (const [id, name] of Object.entries(definition)) {
 			if (!hexKeyRegex4Digits.test(id)) {
 				throwInvalidConfig(
 					"manufacturers",

packages/config/src/Meters.ts

@@ -1,5 +1,4 @@
 import { JSONObject, num2hex } from "@zwave-js/shared/safe";
-import { entries } from "alcalzone-shared/objects";
 import { isObject } from "alcalzone-shared/typeguards";
 import { hexKeyRegexNDigits, throwInvalidConfig } from "./utils_safe";
 
@@ -12,7 +11,7 @@ export class Meter {
 
 		const scales = new Map<number, MeterScale>();
 		if (isObject(definition.scales)) {
-			for (const [scaleId, scaleDefinition] of entries(
+			for (const [scaleId, scaleDefinition] of Object.entries(
 				definition.scales,
 			)) {
 				if (!hexKeyRegexNDigits.test(scaleId)) {

packages/config/src/Notifications.ts

@@ -1,5 +1,4 @@
 import { JSONObject, num2hex } from "@zwave-js/shared/safe";
-import { entries } from "alcalzone-shared/objects";
 import { isArray, isObject } from "alcalzone-shared/typeguards";
 import { hexKeyRegexNDigits, throwInvalidConfig } from "./utils_safe";
 
@@ -34,7 +33,7 @@ export class Notification {
 			: [];
 		const events = new Map<number, NotificationEvent>();
 		if (isObject(definition.events)) {
-			for (const [eventId, eventDefinition] of entries(
+			for (const [eventId, eventDefinition] of Object.entries(
 				definition.events,
 			)) {
 				if (!hexKeyRegexNDigits.test(eventId)) {
@@ -48,7 +47,7 @@ export class Notification {
 				const eventIdNum = parseInt(eventId.slice(2), 16);
 				events.set(
 					eventIdNum,
-					new NotificationEvent(eventIdNum, eventDefinition),
+					new NotificationEvent(eventIdNum, eventDefinition as any),
 				);
 			}
 		}
@@ -100,7 +99,9 @@ export class NotificationVariable {
 			);
 		}
 		const states = new Map<number, NotificationState>();
-		for (const [stateId, stateDefinition] of entries(definition.states)) {
+		for (const [stateId, stateDefinition] of Object.entries(
+			definition.states,
+		)) {
 			if (!hexKeyRegexNDigits.test(stateId)) {
 				throwInvalidConfig(
 					"notifications",
@@ -110,7 +111,7 @@ export class NotificationVariable {
 			const stateIdNum = parseInt(stateId.slice(2), 16);
 			states.set(
 				stateIdNum,
-				new NotificationState(stateIdNum, stateDefinition),
+				new NotificationState(stateIdNum, stateDefinition as any),
 			);
 		}
 		this.states = states;

packages/config/src/SensorTypes.ts

@@ -1,6 +1,5 @@
 import { ZWaveError, ZWaveErrorCodes } from "@zwave-js/core/safe";
 import { JSONObject, num2hex } from "@zwave-js/shared/safe";
-import { entries } from "alcalzone-shared/objects";
 import { isObject } from "alcalzone-shared/typeguards";
 import type { ConfigManager } from "./ConfigManager";
 import { Scale, ScaleGroup } from "./Scales";
@@ -50,7 +49,7 @@ export class SensorType {
 					"sensor types",
 					`scale definition for ${num2hex(key)} is not an object`,
 				);
-			for (const [scaleKey, scaleDefinition] of entries(
+			for (const [scaleKey, scaleDefinition] of Object.entries(
 				definition.scales,
 			)) {
 				if (!hexKeyRegexNDigits.test(scaleKey))
@@ -63,7 +62,7 @@ export class SensorType {
 				const scaleKeyNum = parseInt(scaleKey.slice(2), 16);
 				scales.set(
 					scaleKeyNum,
-					new Scale(scaleKeyNum, scaleDefinition),
+					new Scale(scaleKeyNum, scaleDefinition as any),
 				);
 			}
 			this.scales = scales;

packages/config/src/devices/DeviceConfig.ts

@@ -7,7 +7,6 @@ import {
 	ReadonlyObjectKeyMap,
 	stringify,
 } from "@zwave-js/shared";
-import { entries } from "alcalzone-shared/objects";
 import { isArray, isObject } from "alcalzone-shared/typeguards";
 import * as fs from "fs-extra";
 import { pathExists, readFile, writeFile } from "fs-extra";
@@ -451,7 +450,7 @@ firmwareVersion is malformed or invalid. Must be x.y or x.y.z where x, y, and z
 endpoints is not an object`,
 				);
 			}
-			for (const [key, ep] of entries(definition.endpoints)) {
+			for (const [key, ep] of Object.entries(definition.endpoints)) {
 				if (!/^\d+$/.test(key)) {
 					throwInvalidConfig(
 						`device`,
@@ -463,7 +462,7 @@ found non-numeric endpoint index "${key}" in endpoints`,
 				const epIndex = parseInt(key, 10);
 				endpoints.set(
 					epIndex,
-					new ConditionalEndpointConfig(filename, epIndex, ep),
+					new ConditionalEndpointConfig(filename, epIndex, ep as any),
 				);
 			}
 			this.endpoints = endpoints;
@@ -481,7 +480,7 @@ found non-numeric endpoint index "${key}" in endpoints`,
 associations is not an object`,
 				);
 			}
-			for (const [key, assocDefinition] of entries(
+			for (const [key, assocDefinition] of Object.entries(
 				definition.associations,
 			)) {
 				if (!/^[1-9][0-9]*$/.test(key)) {
@@ -498,7 +497,7 @@ found non-numeric group id "${key}" in associations`,
 					new ConditionalAssociationConfig(
 						filename,
 						keyNum,
-						assocDefinition,
+						assocDefinition as any,
 					),
 				);
 			}
@@ -577,7 +576,7 @@ found invalid param number "${paramNo}" in paramInformation`,
 				// We need to support parsing legacy files because users might have custom configs
 				// However, we don't allow this on CI or during tests/lint
 
-				for (const [key, paramDefinition] of entries(
+				for (const [key, paramDefinition] of Object.entries(
 					definition.paramInformation,
 				)) {
 					const match = /^(\d+)(?:\[0x([0-9a-fA-F]+)\])?$/.exec(key);

packages/config/src/devices/EndpointConfig.ts

@@ -1,5 +1,4 @@
 import type { JSONObject } from "@zwave-js/shared/safe";
-import { entries } from "alcalzone-shared/objects";
 import { isObject } from "alcalzone-shared/typeguards";
 import { throwInvalidConfig } from "../utils_safe";
 import {
@@ -43,7 +42,7 @@ export class ConditionalEndpointConfig
 Endpoint ${index}: associations is not an object`,
 				);
 			}
-			for (const [key, assocDefinition] of entries(
+			for (const [key, assocDefinition] of Object.entries(
 				definition.associations,
 			)) {
 				if (!/^[1-9][0-9]*$/.test(key)) {
@@ -60,7 +59,7 @@ Endpoint ${index}: found non-numeric group id "${key}" in associations`,
 					new ConditionalAssociationConfig(
 						filename,
 						keyNum,
-						assocDefinition,
+						assocDefinition as any,
 					),
 				);
 			}