hap-nodejs 1.1.1-beta.1 → 1.1.1-beta.3

package/dist/lib/definitions/generate-definitions.js

@@ -1,43 +1,41 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-/* eslint-disable @typescript-eslint/no-use-before-define */
-require("./CharacteristicDefinitions");
-const assert_1 = tslib_1.__importDefault(require("assert"));
-const commander_1 = require("commander");
-const fs_1 = tslib_1.__importDefault(require("fs"));
-const path_1 = tslib_1.__importDefault(require("path"));
-const simple_plist_1 = require("simple-plist");
-const Characteristic_1 = require("../Characteristic");
-const uuid_1 = require("../util/uuid");
-const generator_configuration_1 = require("./generator-configuration");
-// noinspection JSUnusedLocalSymbols
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const temp = Characteristic_1.Characteristic; // this to have "../Characteristic" not being only type import, otherwise this would not result in a require statement
-const command = new commander_1.Command("generate-definitions")
-    .version("1.0.0")
-    .option("-f, --force")
-    .option("-m, --metadata <path>", "Define a custom location for the plain-metadata.config file", "/System/Library/PrivateFrameworks/HomeKitDaemon.framework/Resources/plain-metadata.config")
-    .requiredOption("-s, --simulator <path>", "Define the path to the accessory simulator.");
+/* eslint-disable no-console */
+import assert from 'node:assert';
+import { createWriteStream, existsSync, readFileSync, writeFileSync } from 'node:fs';
+import { dirname, join, resolve } from 'node:path';
+import process from 'node:process';
+import { fileURLToPath } from 'node:url';
+import { Command } from 'commander';
+import { readFileSync as readPlistFileSync } from 'simple-plist';
+import * as Characteristic from '../Characteristic.js';
+import { toLongForm } from '../util/uuid.js';
+import './CharacteristicDefinitions.js';
+import { CharacteristicClassAdditions, CharacteristicDeprecatedNames, CharacteristicHidden, CharacteristicManualAdditions, CharacteristicNameOverrides, CharacteristicOverriding, CharacteristicSinceInformation, CharacteristicValidValuesOverride, ServiceCharacteristicConfigurationOverrides, ServiceDeprecatedNames, ServiceManualAdditions, ServiceNameOverrides, ServiceSinceInformation, } from './generator-configuration.js';
+console.log('Generating definitions...');
+// This is needed to have "Characteristic" not being only type import
+console.log(Characteristic.Characteristic);
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const command = new Command('generate-definitions')
+    .version('1.0.0')
+    .option('-f, --force')
+    .option('-m, --metadata <path>', 'Define a custom location for the plain-metadata.config file', '/System/Library/PrivateFrameworks/HomeKitDaemon.framework/Resources/plain-metadata.config')
+    .requiredOption('-s, --simulator <path>', 'Define the path to the accessory simulator.');
 command.parse(process.argv);
 const options = command.opts();
 const metadataFile = options.metadata;
 const simulator = options.simulator;
-if (!fs_1.default.existsSync(metadataFile)) {
+if (!existsSync(metadataFile)) {
     console.warn(`The metadata file at '${metadataFile}' does not exist!`);
     process.exit(1);
 }
-if (!fs_1.default.existsSync(simulator)) {
+if (!existsSync(simulator)) {
     console.warn(`The simulator app directory '${simulator}' does not exist!`);
     process.exit(1);
 }
-const defaultPlist = path_1.default.resolve(simulator, "Contents/Frameworks/HAPAccessoryKit.framework/Resources/default.metadata.plist");
-const defaultMfiPlist = path_1.default.resolve(simulator, "Contents/Frameworks/HAPAccessoryKit.framework/Resources/default_mfi.metadata.plist");
-/* eslint-disable @typescript-eslint/no-explicit-any */
-const plistData = (0, simple_plist_1.readFileSync)(metadataFile);
-const simulatorPlistData = (0, simple_plist_1.readFileSync)(defaultPlist);
-const simulatorMfiPlistData = fs_1.default.existsSync(defaultMfiPlist) ? (0, simple_plist_1.readFileSync)(defaultMfiPlist) : undefined;
-/* eslint-enable @typescript-eslint/no-explicit-any */
+const defaultPlist = resolve(simulator, 'Contents/Frameworks/HAPAccessoryKit.framework/Resources/default.metadata.plist');
+const defaultMfiPlist = resolve(simulator, 'Contents/Frameworks/HAPAccessoryKit.framework/Resources/default_mfi.metadata.plist');
+const plistData = readPlistFileSync(metadataFile);
+const simulatorPlistData = readPlistFileSync(defaultPlist);
+const simulatorMfiPlistData = existsSync(defaultMfiPlist) ? readPlistFileSync(defaultMfiPlist) : undefined;
 if (plistData.SchemaVersion !== 1) {
     console.warn(`Detected unsupported schema version ${plistData.SchemaVersion}!`);
 }
@@ -45,14 +43,14 @@ if (plistData.PlistDictionary.SchemaVersion !== 1) {
     console.warn(`Detect unsupported PlistDictionary schema version ${plistData.PlistDictionary.SchemaVersion}!`);
 }
 console.log(`Parsing version ${plistData.Version}...`);
-const shouldParseCharacteristics = checkWrittenVersion("./CharacteristicDefinitions.ts", plistData.Version);
-const shouldParseServices = checkWrittenVersion("./ServiceDefinitions.ts", plistData.Version);
+const shouldParseCharacteristics = checkWrittenVersion('./CharacteristicDefinitions.ts', plistData.Version);
+const shouldParseServices = checkWrittenVersion('./ServiceDefinitions.ts', plistData.Version);
 if (!options.force && (!shouldParseCharacteristics || !shouldParseServices)) {
-    console.log("Parsed schema version " + plistData.Version + " is older than what's already generated. " +
-        "User --force option to generate and overwrite nonetheless!");
+    console.log(`Parsed schema version ${plistData.Version} is older than what's already generated. `
+        + `User --force option to generate and overwrite nonetheless!`);
     process.exit(1);
 }
-const undefinedUnits = ["micrograms/m^3", "ppm"];
+const undefinedUnits = ['micrograms/m^3', 'ppm'];
 let characteristics;
 const simulatorCharacteristics = new Map();
 let services;
@@ -62,13 +60,11 @@ const properties = new Map();
 try {
     characteristics = checkDefined(plistData.PlistDictionary.HAP.Characteristics);
     services = checkDefined(plistData.PlistDictionary.HAP.Services);
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    // eslint-disable-next-line unused-imports/no-unused-vars
     units = checkDefined(plistData.PlistDictionary.HAP.Units);
     categories = checkDefined(plistData.PlistDictionary.HomeKit.Categories);
     const props = checkDefined(plistData.PlistDictionary.HAP.Properties);
-    // noinspection JSUnusedLocalSymbols
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    for (const [id, definition] of Object.entries(props).sort(([a, aDef], [b, bDef]) => aDef.Position - bDef.Position)) {
+    for (const [id, definition] of Object.entries(props).sort(([, aDef], [, bDef]) => aDef.Position - bDef.Position)) {
         const perm = characteristicPerm(id);
         if (perm) {
             const num = 1 << definition.Position;
@@ -85,7 +81,7 @@ try {
     }
 }
 catch (error) {
-    console.log("Unexpected structure of the plist file!");
+    console.log('Unexpected structure of the plist file!');
     throw error;
 }
 // first step is to check if we are up to date on categories
@@ -94,11 +90,11 @@ for (const definition of Object.values(categories)) {
         console.log(`Detected a new category '${definition.DefaultDescription}' with id ${definition.Identifier}`);
     }
 }
-const characteristicOutput = fs_1.default.createWriteStream(path_1.default.join(__dirname, "CharacteristicDefinitions.ts"));
-characteristicOutput.write("// THIS FILE IS AUTO-GENERATED - DO NOT MODIFY\n");
+const characteristicOutput = createWriteStream(join(__dirname, 'CharacteristicDefinitions.ts'));
+characteristicOutput.write('// THIS FILE IS AUTO-GENERATED - DO NOT MODIFY\n');
 characteristicOutput.write(`// V=${plistData.Version}\n`);
-characteristicOutput.write("\n");
-characteristicOutput.write("import { Access, Characteristic, Formats, Perms, Units } from \"../Characteristic\";\n\n");
+characteristicOutput.write('\n');
+characteristicOutput.write('import { Access, Characteristic, Formats, Perms, Units } from \'../Characteristic.js\'\n');
 /**
  * Characteristics
  */
@@ -106,51 +102,51 @@ const generatedCharacteristics = {}; // indexed by id
 const writtenCharacteristicEntries = {}; // indexed by class name
 for (const [id, definition] of Object.entries(characteristics)) {
     try {
-        if (generator_configuration_1.CharacteristicHidden.has(id)) {
+        if (CharacteristicHidden.has(id)) {
             continue;
         }
         // "Carbon dioxide Detected" -> "Carbon Dioxide Detected"
-        const name = (generator_configuration_1.CharacteristicNameOverrides.get(id)
-            ?? definition.DefaultDescription).split(" ").map(entry => entry[0].toUpperCase() + entry.slice(1)).join(" ");
-        const deprecatedName = generator_configuration_1.CharacteristicDeprecatedNames.get(id);
+        const name = (CharacteristicNameOverrides.get(id)
+            ?? definition.DefaultDescription).split(' ').map(entry => entry[0].toUpperCase() + entry.slice(1)).join(' ');
+        const deprecatedName = CharacteristicDeprecatedNames.get(id);
         // "Target Door State" -> "TargetDoorState", "PM2.5" -> "PM2_5"
-        const className = name.replace(/[\s-]/g, "").replace(/[.]/g, "_");
-        const deprecatedClassName = deprecatedName?.replace(/[\s-]/g, "").replace(/[.]/g, "_");
-        const longUUID = (0, uuid_1.toLongForm)(definition.ShortUUID);
+        const className = name.replace(/[\s-]/g, '').replace(/\./g, '_');
+        const deprecatedClassName = deprecatedName?.replace(/[\s-]/g, '').replace(/\./g, '_');
+        const longUUID = toLongForm(definition.ShortUUID);
         const simulatorCharacteristic = simulatorCharacteristics.get(longUUID);
         const validValues = simulatorCharacteristic?.Constraints?.ValidValues || {};
-        const validValuesOverride = generator_configuration_1.CharacteristicValidValuesOverride.get(id);
+        const validValuesOverride = CharacteristicValidValuesOverride.get(id);
         if (validValuesOverride) {
             for (const [key, value] of Object.entries(validValuesOverride)) {
                 validValues[key] = value;
             }
         }
         for (const [value, name] of Object.entries(validValues)) {
-            let constName = name.toUpperCase().replace(/[^\w]+/g, "_");
+            let constName = name.toUpperCase().replace(/\W+/g, '_');
             if (/^[1-9]/.test(constName)) {
-                constName = "_" + constName; // variables can't start with a number
+                constName = `_${constName}`; // variables can't start with a number
             }
             validValues[value] = constName;
         }
         const validBits = simulatorCharacteristic?.Constraints?.ValidBits;
-        let validBitMasks = undefined;
+        let validBitMasks;
         if (validBits) {
             validBitMasks = {};
             for (const [value, name] of Object.entries(validBits)) {
-                let constName = name.toUpperCase().replace(/[^\w]+/g, "_");
+                let constName = name.toUpperCase().replace(/\W+/g, '_');
                 if (/^[1-9]/.test(constName)) {
-                    constName = "_" + constName; // variables can't start with a number
+                    constName = `_${constName}`; // variables can't start with a number
                 }
-                validBitMasks["" + (1 << parseInt(value, 10))] = constName + "_BIT_MASK";
+                validBitMasks[`${1 << Number.parseInt(value, 10)}`] = `${constName}_BIT_MASK`;
             }
         }
         const generatedCharacteristic = {
-            id: id,
+            id,
             UUID: longUUID,
-            name: name,
-            className: className,
-            deprecatedClassName: deprecatedClassName,
-            since: generator_configuration_1.CharacteristicSinceInformation.get(id),
+            name,
+            className,
+            deprecatedClassName,
+            since: CharacteristicSinceInformation.get(id),
             format: definition.Format,
             units: definition.Units,
             properties: definition.Properties,
@@ -158,12 +154,12 @@ for (const [id, definition] of Object.entries(characteristics)) {
             maxValue: definition.MaxValue,
             stepValue: definition.StepValue,
             maxLength: definition.MaxLength,
-            validValues: validValues,
-            validBitMasks: validBitMasks,
-            classAdditions: generator_configuration_1.CharacteristicClassAdditions.get(id),
+            validValues,
+            validBitMasks,
+            classAdditions: CharacteristicClassAdditions.get(id),
         };
         // call any handler which wants to manually override properties of the generated characteristic
-        generator_configuration_1.CharacteristicOverriding.get(id)?.(generatedCharacteristic);
+        CharacteristicOverriding.get(id)?.(generatedCharacteristic);
         generatedCharacteristics[id] = generatedCharacteristic;
         writtenCharacteristicEntries[className] = generatedCharacteristic;
         if (deprecatedClassName) {
@@ -171,10 +167,10 @@ for (const [id, definition] of Object.entries(characteristics)) {
         }
     }
     catch (error) {
-        throw new Error("Error thrown generating characteristic '" + id + "' (" + definition.DefaultDescription + "): " + error.message);
+        throw new Error(`Error thrown generating characteristic '${id}' (${definition.DefaultDescription}): ${error.message}`);
     }
 }
-for (const [id, generated] of generator_configuration_1.CharacteristicManualAdditions) {
+for (const [id, generated] of CharacteristicManualAdditions) {
     generatedCharacteristics[id] = generated;
     writtenCharacteristicEntries[generated.className] = generated;
     if (generated.deprecatedClassName) {
@@ -184,20 +180,20 @@ for (const [id, generated] of generator_configuration_1.CharacteristicManualAddi
 for (const generated of Object.values(generatedCharacteristics)
     .sort((a, b) => a.className.localeCompare(b.className))) {
     try {
-        characteristicOutput.write("/**\n");
-        characteristicOutput.write(" * Characteristic \"" + generated.name + "\"\n");
+        characteristicOutput.write('\n/**\n');
+        characteristicOutput.write(` * Characteristic "${generated.name}"\n`);
         if (generated.since) {
-            characteristicOutput.write(" * @since iOS " + generated.since + "\n");
+            characteristicOutput.write(` * @since iOS ${generated.since}\n`);
         }
         if (generated.deprecatedNotice) {
-            characteristicOutput.write(" * @deprecated " + generated.deprecatedNotice + "\n");
+            characteristicOutput.write(` * @deprecated ${generated.deprecatedNotice}\n`);
         }
-        characteristicOutput.write(" */\n");
-        characteristicOutput.write("export class " + generated.className + " extends Characteristic {\n\n");
-        characteristicOutput.write("  public static readonly UUID: string = \"" + generated.UUID + "\";\n\n");
+        characteristicOutput.write(' */\n');
+        characteristicOutput.write(`export class ${generated.className} extends Characteristic {\n`);
+        characteristicOutput.write(`  public static readonly UUID: string = '${generated.UUID}'\n\n`);
         const classAdditions = generated.classAdditions;
         if (classAdditions) {
-            characteristicOutput.write(classAdditions.map(line => "  " + line + "\n").join("") + "\n");
+            characteristicOutput.write(`${classAdditions.map(line => `  ${line}\n`).join('')}\n`);
         }
         const validValuesEntries = Object.entries(generated.validValues ?? {});
         if (validValuesEntries.length) {
@@ -205,85 +201,85 @@ for (const generated of Object.values(generatedCharacteristics)
                 if (!name) {
                     continue;
                 }
-                characteristicOutput.write(`  public static readonly ${name} = ${value};\n`);
+                // fix a weird edge case
+                let printName = name;
+                if (name === 'PROGRAM_SCHEDULED_MANUAL_MODE_') {
+                    printName = 'PROGRAM_SCHEDULED_MANUAL_MODE';
+                }
+                characteristicOutput.write(`  public static readonly ${printName} = ${value}\n`);
             }
-            characteristicOutput.write("\n");
+            characteristicOutput.write('\n');
         }
         if (generated.validBitMasks) {
             for (const [value, name] of Object.entries(generated.validBitMasks)) {
-                characteristicOutput.write(`  public static readonly ${name} = ${value};\n`);
+                characteristicOutput.write(`  public static readonly ${name} = ${value}\n`);
             }
-            characteristicOutput.write("\n");
+            characteristicOutput.write('\n');
         }
-        characteristicOutput.write("  constructor() {\n");
-        characteristicOutput.write("    super(\"" + generated.name + "\", " + generated.className + ".UUID, {\n");
-        characteristicOutput.write("      format: Formats." + characteristicFormat(generated.format) + ",\n");
-        characteristicOutput.write("      perms: [" + generatePermsString(generated.id, generated.properties) + "],\n");
+        characteristicOutput.write('  constructor() {\n');
+        characteristicOutput.write(`    super('${generated.name}', ${generated.className}.UUID, {\n`);
+        characteristicOutput.write(`      format: Formats.${characteristicFormat(generated.format)},\n`);
+        characteristicOutput.write(`      perms: [${generatePermsString(generated.id, generated.properties)}],\n`);
         if (generated.units && !undefinedUnits.includes(generated.units)) {
-            characteristicOutput.write("      unit: Units." + characteristicUnit(generated.units) + ",\n");
+            characteristicOutput.write(`      unit: Units.${characteristicUnit(generated.units)},\n`);
         }
         if (generated.minValue != null) {
-            characteristicOutput.write("      minValue: " + generated.minValue + ",\n");
+            characteristicOutput.write(`      minValue: ${generated.minValue},\n`);
         }
         if (generated.maxValue != null) {
-            characteristicOutput.write("      maxValue: " + generated.maxValue + ",\n");
+            characteristicOutput.write(`      maxValue: ${generated.maxValue},\n`);
         }
         if (generated.stepValue != null) {
-            characteristicOutput.write("      minStep: " + generated.stepValue + ",\n");
+            characteristicOutput.write(`      minStep: ${generated.stepValue},\n`);
         }
         if (generated.maxLength != null) {
-            characteristicOutput.write("      maxLen: " + generated.maxLength + ",\n");
+            characteristicOutput.write(`      maxLen: ${generated.maxLength},\n`);
         }
         if (validValuesEntries.length) {
-            characteristicOutput.write("      validValues: [" + Object.keys(generated.validValues).join(", ") + "],\n");
+            characteristicOutput.write(`      validValues: [${Object.keys(generated.validValues).join(', ')}],\n`);
         }
         if (generated.adminOnlyAccess) {
-            characteristicOutput.write("      adminOnlyAccess: ["
-                + generated.adminOnlyAccess.map(value => "Access." + characteristicAccess(value)).join(", ") + "],\n");
+            characteristicOutput.write(`      adminOnlyAccess: [${generated.adminOnlyAccess.map(value => `Access.${characteristicAccess(value)}`).join(', ')}],\n`);
         }
-        characteristicOutput.write("    });\n");
-        characteristicOutput.write("    this.value = this.getDefaultValue();\n");
-        characteristicOutput.write("  }\n");
-        characteristicOutput.write("}\n");
+        characteristicOutput.write('    })\n');
+        characteristicOutput.write('    this.value = this.getDefaultValue()\n');
+        characteristicOutput.write('  }\n');
+        characteristicOutput.write('}\n');
         if (generated.deprecatedClassName) {
-            characteristicOutput.write("// noinspection JSDeprecatedSymbols\n");
-            characteristicOutput.write("Characteristic." + generated.deprecatedClassName + " = " + generated.className + ";\n");
-        }
-        if (generated.deprecatedNotice) {
-            characteristicOutput.write("// noinspection JSDeprecatedSymbols\n");
+            characteristicOutput.write(`Characteristic.${generated.deprecatedClassName} = ${generated.className}\n`);
         }
-        characteristicOutput.write("Characteristic." + generated.className + " = " + generated.className + ";\n\n");
+        characteristicOutput.write(`Characteristic.${generated.className} = ${generated.className}\n`);
     }
     catch (error) {
-        throw new Error("Error thrown writing characteristic '" + generated.id + "' (" + generated.className + "): " + error.message);
+        throw new Error(`Error thrown writing characteristic '${generated.id}' (${generated.className}): ${error.message}`);
     }
 }
 characteristicOutput.end();
 const characteristicProperties = Object.entries(writtenCharacteristicEntries).sort(([a], [b]) => a.localeCompare(b));
-rewriteProperties("Characteristic", characteristicProperties);
+rewriteProperties('Characteristic', characteristicProperties);
 writeCharacteristicTestFile();
 /**
  * Services
  */
-const serviceOutput = fs_1.default.createWriteStream(path_1.default.join(__dirname, "ServiceDefinitions.ts"));
-serviceOutput.write("// THIS FILE IS AUTO-GENERATED - DO NOT MODIFY\n");
+const serviceOutput = createWriteStream(join(__dirname, 'ServiceDefinitions.ts'));
+serviceOutput.write('// THIS FILE IS AUTO-GENERATED - DO NOT MODIFY\n');
 serviceOutput.write(`// V=${plistData.Version}\n`);
-serviceOutput.write("\n");
-serviceOutput.write("import { Characteristic } from \"../Characteristic\";\n");
-serviceOutput.write("import { Service } from \"../Service\";\n\n");
+serviceOutput.write('\n');
+serviceOutput.write('import { Characteristic } from \'../Characteristic.js\'\n');
+serviceOutput.write('import { Service } from \'../Service.js\'\n');
 const generatedServices = {}; // indexed by id
 const writtenServiceEntries = {}; // indexed by class name
 for (const [id, definition] of Object.entries(services)) {
     try {
         // "Carbon dioxide Sensor" -> "Carbon Dioxide Sensor"
-        const name = (generator_configuration_1.ServiceNameOverrides.get(id) ?? definition.DefaultDescription).split(" ").map(entry => entry[0].toUpperCase() + entry.slice(1)).join(" ");
-        const deprecatedName = generator_configuration_1.ServiceDeprecatedNames.get(id);
-        const className = name.replace(/[\s-]/g, "").replace(/[.]/g, "_");
-        const deprecatedClassName = deprecatedName?.replace(/[\s-]/g, "").replace(/[.]/g, "_");
-        const longUUID = (0, uuid_1.toLongForm)(definition.ShortUUID);
+        const name = (ServiceNameOverrides.get(id) ?? definition.DefaultDescription).split(' ').map(entry => entry[0].toUpperCase() + entry.slice(1)).join(' ');
+        const deprecatedName = ServiceDeprecatedNames.get(id);
+        const className = name.replace(/[\s-]/g, '').replace(/\./g, '_');
+        const deprecatedClassName = deprecatedName?.replace(/[\s-]/g, '').replace(/\./g, '_');
+        const longUUID = toLongForm(definition.ShortUUID);
         const requiredCharacteristics = definition.Characteristics.Required;
         const optionalCharacteristics = definition.Characteristics.Optional;
-        const configurationOverride = generator_configuration_1.ServiceCharacteristicConfigurationOverrides.get(id);
+        const configurationOverride = ServiceCharacteristicConfigurationOverrides.get(id);
         if (configurationOverride) {
             if (configurationOverride.removedRequired) {
                 for (const entry of configurationOverride.removedRequired) {
@@ -317,14 +313,14 @@ for (const [id, definition] of Object.entries(services)) {
             }
         }
         const generatedService = {
-            id: id,
+            id,
             UUID: longUUID,
-            name: name,
-            className: className,
-            deprecatedClassName: deprecatedClassName,
-            since: generator_configuration_1.ServiceSinceInformation.get(id),
-            requiredCharacteristics: requiredCharacteristics,
-            optionalCharacteristics: optionalCharacteristics,
+            name,
+            className,
+            deprecatedClassName,
+            since: ServiceSinceInformation.get(id),
+            requiredCharacteristics,
+            optionalCharacteristics,
         };
         generatedServices[id] = generatedService;
         writtenServiceEntries[className] = generatedService;
@@ -333,10 +329,10 @@ for (const [id, definition] of Object.entries(services)) {
         }
     }
     catch (error) {
-        throw new Error("Error thrown generating service '" + id + "' (" + definition.DefaultDescription + "): " + error.message);
+        throw new Error(`Error thrown generating service '${id}' (${definition.DefaultDescription}): ${error.message}`);
     }
 }
-for (const [id, generated] of generator_configuration_1.ServiceManualAdditions) {
+for (const [id, generated] of ServiceManualAdditions) {
     generatedServices[id] = generated;
     writtenServiceEntries[generated.className] = generated;
     if (generated.deprecatedClassName) {
@@ -346,279 +342,276 @@ for (const [id, generated] of generator_configuration_1.ServiceManualAdditions)
 for (const generated of Object.values(generatedServices)
     .sort((a, b) => a.className.localeCompare(b.className))) {
     try {
-        serviceOutput.write("/**\n");
-        serviceOutput.write(" * Service \"" + generated.name + "\"\n");
+        serviceOutput.write('\n/**\n');
+        serviceOutput.write(` * Service "${generated.name}"\n`);
         if (generated.since) {
-            serviceOutput.write(" * @since iOS " + generated.since + "\n");
+            serviceOutput.write(` * @since iOS ${generated.since}\n`);
         }
         if (generated.deprecatedNotice) {
-            serviceOutput.write(" * @deprecated " + generated.deprecatedNotice + "\n");
-        }
-        serviceOutput.write(" */\n");
-        serviceOutput.write("export class " + generated.className + " extends Service {\n\n");
-        serviceOutput.write("  public static readonly UUID: string = \"" + generated.UUID + "\";\n\n");
-        serviceOutput.write("  constructor(displayName?: string, subtype?: string) {\n");
-        serviceOutput.write("    super(displayName, " + generated.className + ".UUID, subtype);\n\n");
-        serviceOutput.write("    // Required Characteristics\n");
+            serviceOutput.write(` * @deprecated ${generated.deprecatedNotice}\n`);
+        }
+        serviceOutput.write(' */\n');
+        serviceOutput.write(`export class ${generated.className} extends Service {\n`);
+        serviceOutput.write(`  public static readonly UUID: string = '${generated.UUID}'\n\n`);
+        serviceOutput.write('  constructor(displayName?: string, subtype?: string) {\n');
+        serviceOutput.write(`    super(displayName, ${generated.className}.UUID, subtype)\n\n`);
+        serviceOutput.write('    // Required Characteristics\n');
         for (const required of generated.requiredCharacteristics) {
             const characteristic = generatedCharacteristics[required];
             if (!characteristic) {
-                console.warn("Could not find required characteristic " + required + " for " + generated.className);
+                console.warn(`Could not find required characteristic ${required} for ${generated.className}`);
                 continue;
             }
-            if (required === "name") {
-                serviceOutput.write("    if (!this.testCharacteristic(Characteristic.Name)) { // workaround for Name characteristic collision in constructor\n");
-                serviceOutput.write("      this.addCharacteristic(Characteristic.Name).updateValue(\"Unnamed Service\");\n");
-                serviceOutput.write("    }\n");
+            if (required === 'name') {
+                serviceOutput.write('    if (!this.testCharacteristic(Characteristic.Name)) { // workaround for Name characteristic collision in constructor\n');
+                serviceOutput.write('      this.addCharacteristic(Characteristic.Name).updateValue(\'Unnamed Service\')\n');
+                serviceOutput.write('    }\n');
             }
             else {
-                serviceOutput.write("    this.addCharacteristic(Characteristic." + characteristic.className + ");\n");
+                serviceOutput.write(`    this.addCharacteristic(Characteristic.${characteristic.className})\n`);
             }
         }
         if (generated.optionalCharacteristics?.length) {
-            serviceOutput.write("\n    // Optional Characteristics\n");
+            serviceOutput.write('\n    // Optional Characteristics\n');
             for (const optional of generated.optionalCharacteristics) {
                 const characteristic = generatedCharacteristics[optional];
                 if (!characteristic) {
-                    console.warn("Could not find optional characteristic " + optional + " for " + generated.className);
+                    console.warn(`Could not find optional characteristic ${optional} for ${generated.className}`);
                     continue;
                 }
-                serviceOutput.write("    this.addOptionalCharacteristic(Characteristic." + characteristic.className + ");\n");
+                serviceOutput.write(`    this.addOptionalCharacteristic(Characteristic.${characteristic.className})\n`);
             }
         }
-        serviceOutput.write("  }\n}\n");
+        serviceOutput.write('  }\n}\n');
         if (generated.deprecatedClassName) {
-            serviceOutput.write("// noinspection JSDeprecatedSymbols\n");
-            serviceOutput.write("Service." + generated.deprecatedClassName + " = " + generated.className + ";\n");
-        }
-        if (generated.deprecatedNotice) {
-            serviceOutput.write("// noinspection JSDeprecatedSymbols\n");
+            serviceOutput.write(`Service.${generated.deprecatedClassName} = ${generated.className}\n`);
         }
-        serviceOutput.write("Service." + generated.className + " = " + generated.className + ";\n\n");
+        serviceOutput.write(`Service.${generated.className} = ${generated.className}\n`);
     }
     catch (error) {
-        throw new Error("Error thrown writing service '" + generated.id + "' (" + generated.className + "): " + error.message);
+        throw new Error(`Error thrown writing service '${generated.id}' (${generated.className}): ${error.message}`);
     }
 }
 serviceOutput.end();
 const serviceProperties = Object.entries(writtenServiceEntries).sort(([a], [b]) => a.localeCompare(b));
-rewriteProperties("Service", serviceProperties);
+rewriteProperties('Service', serviceProperties);
 writeServicesTestFile();
 // ------------------------ utils ------------------------
 function checkDefined(input) {
     if (!input) {
-        throw new Error("value is undefined!");
+        throw new Error('value is undefined!');
     }
     return input;
 }
 function characteristicFormat(format) {
     // @ts-expect-error: forceConsistentCasingInFileNames compiler option
-    for (const [key, value] of Object.entries(Characteristic_1.Formats)) {
+    for (const [key, value] of Object.entries(Characteristic.Formats)) {
         if (value === format) {
             return key;
         }
     }
-    throw new Error("Unknown characteristic format '" + format + "'");
+    throw new Error(`Unknown characteristic format '${format}'`);
 }
 function characteristicUnit(unit) {
     // @ts-expect-error: forceConsistentCasingInFileNames compiler option
-    for (const [key, value] of Object.entries(Characteristic_1.Units)) {
+    for (const [key, value] of Object.entries(Characteristic.Units)) {
         if (value === unit) {
             return key;
         }
     }
-    throw new Error("Unknown characteristic format '" + unit + "'");
+    throw new Error(`Unknown characteristic format '${unit}'`);
 }
 function characteristicAccess(access) {
     // @ts-expect-error: forceConsistentCasingInFileNames compiler option
-    for (const [key, value] of Object.entries(Characteristic_1.Access)) {
+    for (const [key, value] of Object.entries(Characteristic.Access)) {
         if (value === access) {
             return key;
         }
     }
-    throw new Error("Unknown access for '" + access + "'");
+    throw new Error(`Unknown access for '${access}'`);
 }
 function characteristicPerm(id) {
     switch (id) {
-        case "aa":
-            return "ADDITIONAL_AUTHORIZATION";
-        case "hidden":
-            return "HIDDEN";
-        case "notify":
-            return "NOTIFY";
-        case "read":
-            return "PAIRED_READ";
-        case "timedWrite":
-            return "TIMED_WRITE";
-        case "write":
-            return "PAIRED_WRITE";
-        case "writeResponse":
-            return "WRITE_RESPONSE";
-        case "broadcast": // used for bluetooth
+        case 'aa':
+            return 'ADDITIONAL_AUTHORIZATION';
+        case 'hidden':
+            return 'HIDDEN';
+        case 'notify':
+            return 'NOTIFY';
+        case 'read':
+            return 'PAIRED_READ';
+        case 'timedWrite':
+            return 'TIMED_WRITE';
+        case 'write':
+            return 'PAIRED_WRITE';
+        case 'writeResponse':
+            return 'WRITE_RESPONSE';
+        case 'broadcast': // used for bluetooth
             return undefined;
-        case "adminOnly":
+        case 'adminOnly':
             return undefined; // TODO add support for it (currently unused though)
         default:
-            throw new Error("Received unknown perms id: " + id);
+            throw new Error(`Received unknown perms id: ${id}`);
     }
 }
 function generatePermsString(id, propertiesBitMap) {
     const perms = [];
     for (const [bitMap, name] of properties) {
-        if (name === "ADDITIONAL_AUTHORIZATION") {
-            // aa set by homed just signals that aa may be supported. Setting up aa will always require a custom made app though
+        if (name === 'ADDITIONAL_AUTHORIZATION') {
+            // aa set by homed just signals that aa may be supported. Setting up aa will always require a custom-made app though
             continue;
         }
         if ((propertiesBitMap | bitMap) === propertiesBitMap) { // if it stays the same the bit is set
-            perms.push("Perms." + name);
+            perms.push(`Perms.${name}`);
         }
     }
-    const result = perms.join(", ");
-    (0, assert_1.default)(!!result, "perms string cannot be empty (" + propertiesBitMap + ")");
+    const result = perms.join(', ');
+    assert(!!result, `perms string cannot be empty (${propertiesBitMap})`);
     return result;
 }
 function checkWrittenVersion(filePath, parsingVersion) {
-    filePath = path_1.default.resolve(__dirname, filePath);
-    const content = fs_1.default.readFileSync(filePath, { encoding: "utf8" }).split("\n", 3);
+    filePath = resolve(__dirname, filePath);
+    const content = readFileSync(filePath, { encoding: 'utf8' }).split('\n', 3);
     const v = content[1];
-    if (!v.startsWith("// V=")) {
-        throw new Error("Could not detect definition version for '" + filePath + "'");
+    if (!v.startsWith('// V=')) {
+        throw new Error(`Could not detect definition version for '${filePath}'`);
     }
-    const version = parseInt(v.replace("// V=", ""), 10);
+    const version = Number.parseInt(v.replace('// V=', ''), 10);
     return parsingVersion >= version;
 }
 function rewriteProperties(className, properties) {
-    const filePath = path_1.default.resolve(__dirname, "../" + className + ".ts");
-    if (!fs_1.default.existsSync(filePath)) {
-        throw new Error("File '" + filePath + "' does not exist!");
+    const filePath = resolve(__dirname, `../${className}.ts`);
+    if (!existsSync(filePath)) {
+        throw new Error(`File '${filePath}' does not exist!`);
     }
-    const file = fs_1.default.readFileSync(filePath, { encoding: "utf8" });
-    const lines = file.split("\n");
+    const file = readFileSync(filePath, { encoding: 'utf8' });
+    const lines = file.split('\n');
     let i = 0;
     let importStart = -1;
     let importEnd = -1;
     let foundImport = false;
     for (; i < lines.length; i++) {
         const line = lines[i];
-        if (line === "import type {") {
+        if (line === 'import type {') {
             importStart = i; // save last import start;
         }
-        else if (line === "} from \"./definitions\";") {
+        else if (line === '} from \'./definitions\'') {
             importEnd = i;
             foundImport = true;
             break;
         }
     }
     if (!foundImport) {
-        throw new Error("Could not find import section!");
+        throw new Error('Could not find import section!');
     }
     let startIndex = -1;
     let stopIndex = -1;
     for (; i < lines.length; i++) {
-        if (lines[i] === "  // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-") {
+        if (lines[i] === '  // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-') {
             startIndex = i;
             break;
         }
     }
     if (startIndex === -1) {
-        throw new Error("Could not find start pattern in file!");
+        throw new Error('Could not find start pattern in file!');
     }
     for (; i < lines.length; i++) {
-        if (lines[i] === "  // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=") {
+        if (lines[i] === '  // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=') {
             stopIndex = i;
             break;
         }
     }
     if (stopIndex === -1) {
-        throw new Error("Could not find stop pattern in file!");
+        throw new Error('Could not find stop pattern in file!');
     }
     const importSize = importEnd - importStart - 1;
     const newImports = properties
         .filter(([key, value]) => key === value.className)
-        .map(([key]) => "  " + key + ",");
+        .map(([key]) => `  ${key},`);
     lines.splice(importStart + 1, importSize, ...newImports); // remove current imports
     const importDelta = newImports.length - importSize;
     startIndex += importDelta;
     stopIndex += importDelta;
     const amount = stopIndex - startIndex - 1;
     const newContentLines = properties.map(([key, value]) => {
-        let line = "";
+        let line = '';
         let deprecatedNotice = value.deprecatedNotice;
         if (key !== value.className) {
-            deprecatedNotice = "Please use {@link " + className + "." + value.className + "}." // prepend deprecated notice
-                + (deprecatedNotice ? " " + deprecatedNotice : "");
+            deprecatedNotice = `Please use {@link ${className}.${value.className}}.${ // prepend deprecated notice
+            deprecatedNotice ? ` ${deprecatedNotice}` : ''}`;
         }
-        line += "  /**\n";
-        line += "   * @group " + className + " Definitions\n";
+        line += '  /**\n';
+        line += `   * @group ${className} Definitions\n`;
         if (deprecatedNotice) {
-            line += "   * @deprecated " + deprecatedNotice + "\n";
+            line += `   * @deprecated ${deprecatedNotice}\n`;
         }
-        line += "   */\n";
-        line += "  public static " + key + ": typeof " + value.className + ";";
+        line += '   */\n';
+        line += `  public static ${key}: typeof ${value.className}`;
         return line;
     });
     lines.splice(startIndex + 1, amount, ...newContentLines); // insert new lines
-    const resultContent = lines.join("\n");
-    fs_1.default.writeFileSync(filePath, resultContent, { encoding: "utf8" });
+    const resultContent = lines.join('\n');
+    writeFileSync(filePath, resultContent, { encoding: 'utf8' });
 }
 function writeCharacteristicTestFile() {
     const characteristics = Object.values(generatedCharacteristics).sort((a, b) => a.className.localeCompare(b.className));
-    const testOutput = fs_1.default.createWriteStream(path_1.default.resolve(__dirname, "./CharacteristicDefinitions.spec.ts"), { encoding: "utf8" });
-    testOutput.write("// THIS FILE IS AUTO-GENERATED - DO NOT MODIFY\n");
-    testOutput.write("import \"./\";\n\n");
-    testOutput.write("import { Characteristic } from \"../Characteristic\";\n\n");
-    testOutput.write("describe(\"CharacteristicDefinitions\", () => {");
+    const testOutput = createWriteStream(resolve(__dirname, './CharacteristicDefinitions.spec.ts'), { encoding: 'utf8' });
+    testOutput.write('// THIS FILE IS AUTO-GENERATED - DO NOT MODIFY\n');
+    testOutput.write('/* eslint-disable no-new */\n');
+    testOutput.write('import { describe, it } from \'vitest\'\n\n');
+    testOutput.write('import { Characteristic } from \'../Characteristic.js\'\n');
+    testOutput.write('import \'./index.js\'\n\n');
+    testOutput.write('describe(\'characteristicDefinitions\', () => {');
     for (const generated of characteristics) {
-        testOutput.write("\n");
-        testOutput.write("  describe(\"" + generated.className + "\", () => {\n");
+        testOutput.write('\n');
+        testOutput.write(`  describe('${generated.className[0].toLowerCase()}${generated.className.slice(1)}', () => {\n`);
         // first test is just calling the constructor
-        testOutput.write("    it(\"should be able to construct\", () => {\n");
-        testOutput.write("      new Characteristic." + generated.className + "();\n");
+        testOutput.write('    it(\'should be able to construct\', () => {\n');
+        testOutput.write(`      new Characteristic.${generated.className}()\n`);
         if (generated.deprecatedClassName) {
-            testOutput.write("      // noinspection JSDeprecatedSymbols\n");
-            testOutput.write("      new Characteristic." + generated.deprecatedClassName + "();\n");
+            testOutput.write(`      new Characteristic.${generated.deprecatedClassName}()\n`);
         }
-        testOutput.write("    });\n");
-        testOutput.write("  });\n");
+        testOutput.write('    })\n');
+        testOutput.write('  })\n');
     }
-    testOutput.write("});\n");
+    testOutput.write('})\n');
     testOutput.end();
 }
 function writeServicesTestFile() {
     const services = Object.values(generatedServices).sort((a, b) => a.className.localeCompare(b.className));
-    const testOutput = fs_1.default.createWriteStream(path_1.default.resolve(__dirname, "./ServiceDefinitions.spec.ts"), { encoding: "utf8" });
-    testOutput.write("// THIS FILE IS AUTO-GENERATED - DO NOT MODIFY\n");
-    testOutput.write("import \"./\";\n\n");
-    testOutput.write("import { Characteristic } from \"../Characteristic\";\n");
-    testOutput.write("import { Service } from \"../Service\";\n\n");
-    testOutput.write("describe(\"ServiceDefinitions\", () => {");
+    const testOutput = createWriteStream(resolve(__dirname, './ServiceDefinitions.spec.ts'), { encoding: 'utf8' });
+    testOutput.write('// THIS FILE IS AUTO-GENERATED - DO NOT MODIFY\n');
+    testOutput.write('import { describe, expect, it } from \'vitest\'\n\n');
+    testOutput.write('import { Characteristic } from \'../Characteristic.js\'\n');
+    testOutput.write('import { Service } from \'../Service.js\'\n');
+    testOutput.write('import \'./index.js\'\n\n');
+    testOutput.write('describe(\'serviceDefinitions\', () => {');
     for (const generated of services) {
-        testOutput.write("\n");
-        testOutput.write("  describe(\"" + generated.className + "\", () => {\n");
+        testOutput.write('\n');
+        testOutput.write(`  describe('${generated.className[0].toLowerCase()}${generated.className.slice(1)}', () => {\n`);
         // first test is just calling the constructor
-        testOutput.write("    it(\"should be able to construct\", () => {\n");
-        testOutput.write("      const service0 = new Service." + generated.className + "();\n");
-        testOutput.write("      const service1 = new Service." + generated.className + "(\"test name\");\n");
-        testOutput.write("      const service2 = new Service." + generated.className + "(\"test name\", \"test sub type\");\n\n");
-        testOutput.write("      expect(service0.displayName).toBe(\"\");\n");
-        testOutput.write("      expect(service0.testCharacteristic(Characteristic.Name)).toBe(" + generated.requiredCharacteristics.includes("name") + ");\n");
-        testOutput.write("      expect(service0.subtype).toBeUndefined();\n\n");
-        testOutput.write("      expect(service1.displayName).toBe(\"test name\");\n");
-        testOutput.write("      expect(service1.testCharacteristic(Characteristic.Name)).toBe(true);\n");
-        testOutput.write("      expect(service1.getCharacteristic(Characteristic.Name).value).toBe(\"test name\");\n");
-        testOutput.write("      expect(service1.subtype).toBeUndefined();\n\n");
-        testOutput.write("      expect(service2.displayName).toBe(\"test name\");\n");
-        testOutput.write("      expect(service2.testCharacteristic(Characteristic.Name)).toBe(true);\n");
-        testOutput.write("      expect(service2.getCharacteristic(Characteristic.Name).value).toBe(\"test name\");\n");
-        testOutput.write("      expect(service2.subtype).toBe(\"test sub type\");\n");
+        testOutput.write('    it(\'should be able to construct\', () => {\n');
+        testOutput.write(`      const service0 = new Service.${generated.className}()\n`);
+        testOutput.write(`      const service1 = new Service.${generated.className}('test name')\n`);
+        testOutput.write(`      const service2 = new Service.${generated.className}('test name', 'test sub type')\n\n`);
+        testOutput.write('      expect(service0.displayName).toBe(\'\')\n');
+        testOutput.write(`      expect(service0.testCharacteristic(Characteristic.Name)).toBe(${generated.requiredCharacteristics.includes('name')})\n`);
+        testOutput.write('      expect(service0.subtype).toBeUndefined()\n\n');
+        testOutput.write('      expect(service1.displayName).toBe(\'test name\')\n');
+        testOutput.write('      expect(service1.testCharacteristic(Characteristic.Name)).toBe(true)\n');
+        testOutput.write('      expect(service1.getCharacteristic(Characteristic.Name).value).toBe(\'test name\')\n');
+        testOutput.write('      expect(service1.subtype).toBeUndefined()\n\n');
+        testOutput.write('      expect(service2.displayName).toBe(\'test name\')\n');
+        testOutput.write('      expect(service2.testCharacteristic(Characteristic.Name)).toBe(true)\n');
+        testOutput.write('      expect(service2.getCharacteristic(Characteristic.Name).value).toBe(\'test name\')\n');
+        testOutput.write('      expect(service2.subtype).toBe(\'test sub type\')\n');
         if (generated.deprecatedClassName) {
-            testOutput.write("      // noinspection JSDeprecatedSymbols\n");
-            testOutput.write("\n      new Service." + generated.deprecatedClassName + "();\n");
+            testOutput.write(`\n      new Service.${generated.deprecatedClassName}()\n`);
         }
-        testOutput.write("    });\n");
-        testOutput.write("  });\n");
+        testOutput.write('    })\n');
+        testOutput.write('  })\n');
     }
-    testOutput.write("});\n");
+    testOutput.write('})\n');
     testOutput.end();
 }
 //# sourceMappingURL=generate-definitions.js.map