final version

package.json

@@ -25,8 +25,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@digital-alchemy/core": "^0.3.12",
-    "@digital-alchemy/hass": "^0.3.10",
+    "@digital-alchemy/core": "^0.3.11",
+    "@digital-alchemy/hass": "^0.3.12",
     "js-yaml": "^4.1.0"
   },
   "devDependencies": {
@@ -38,8 +38,8 @@
     "@types/mute-stream": "^0.0.4",
     "@types/node": "^20.12.7",
     "@types/uuid": "^9.0.8",
-    "@typescript-eslint/eslint-plugin": "7.6.0",
-    "@typescript-eslint/parser": "7.6.0",
+    "@typescript-eslint/eslint-plugin": "7.7.0",
+    "@typescript-eslint/parser": "7.7.0",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-import": "^2.29.1",

src/build.extension.ts

@@ -54,9 +54,36 @@ export function BuildTypes({
       `// This file is generated, and is automatically updated as a npm post install step`,
       "// Do not edit this file, it will only affect type definitions, not functional code",
       `import { PICK_ENTITY } from "./helpers";`,
+      ``,
+      `// #MARK: ENTITY_SETUP`,
       `export const ENTITY_SETUP = ${JSON.stringify(entitySetup, undefined, "  ")};`,
+      ``,
+      `// #MARK: iCallService`,
       typeInterface,
-      type_writer.identifiers(),
-    ].join(`\n\n`);
+      ``,
+      `// #MARK: REGISTRY_SETUP`,
+      type_writer.identifiers.RegistryDetails(),
+      ``,
+      `// #MARK: TAreaId`,
+      type_writer.identifiers.area(),
+      ``,
+      `// #MARK: TDeviceId`,
+      type_writer.identifiers.device(),
+      ``,
+      `// #MARK: TFloorId`,
+      type_writer.identifiers.floor(),
+      ``,
+      `// #MARK: TLabelId`,
+      type_writer.identifiers.label(),
+      ``,
+      `// #MARK: TZoneId`,
+      type_writer.identifiers.zone(),
+      ``,
+      `// #MARK: TRawEntityIds`,
+      type_writer.identifiers.entityIds(entities),
+      ``,
+      `// #MARK: TRawDomains`,
+      type_writer.identifiers.domains(entities),
+    ].join(`\n`);
   }
 }

src/i-call-service.extension.ts

@@ -359,17 +359,22 @@ export async function ICallServiceExtension({
 
     // #MARK: BuildDomain
     function buildDomain({ domain, services }: HassServiceDTO) {
-      return factory.createPropertySignature(
-        undefined,
-        factory.createIdentifier(domain),
-        undefined,
-        factory.createTypeLiteralNode(
-          // Create functions based on provided services
-          // { [...service_name](service_data): Promise<void> }
-          Object.entries(services)
-            .sort(([a], [b]) => (a > b ? UP : DOWN))
-            .map(([key, value]) => buildService(domain, key, value)),
+      return addSyntheticLeadingComment(
+        factory.createPropertySignature(
+          undefined,
+          factory.createIdentifier(domain),
+          undefined,
+          factory.createTypeLiteralNode(
+            // Create functions based on provided services
+            // { [...service_name](service_data): Promise<void> }
+            Object.entries(services)
+              .sort(([a], [b]) => (a > b ? UP : DOWN))
+              .map(([key, value]) => buildService(domain, key, value)),
+          ),
         ),
+        SyntaxKind.SingleLineCommentTrivia,
+        `#MARK: ${domain}`,
+        true,
       );
     }