Fix types package not working because i didn't understand typescript

.pre-commit-config.yaml

@@ -8,6 +8,7 @@ repos:
       - id: end-of-file-fixer
       - id: check-yaml
       - id: check-added-large-files
+      - id: check-merge-conflict
 
   - repo: https://github.com/Lucas-C/pre-commit-hooks
     rev: v1.5.5
@@ -27,3 +28,8 @@ repos:
     hooks:
       - id: prettier
         files: '\.(c?js.?|ts.?)$'
+
+  - repo: https://github.com/gitleaks/gitleaks
+    rev: v8.18.2
+    hooks:
+      - id: gitleaks

packages/api/routes/groups.ts

@@ -5,7 +5,7 @@ import express, { Request, Response, Router } from "express";
 import { Zigbee2MqttService } from "../zigbee2mqttService";
 import { ApiError } from "./api";
 import { range } from "../utils";
-import { Scene } from "../../types/zigbee_types";
+import { Scene } from "@starlight/types";
 
 const router = express.Router();
 

packages/api/zigbee2mqttService.ts

@@ -3,9 +3,14 @@
 
 import mqtt, { MqttClient, IClientOptions } from "mqtt";
 import { logger } from "./logger";
-import { BridgeResponse, Device, Group, Scene } from "../types/zigbee_types";
+import {
+  type BridgeResponse,
+  type Device,
+  type Group,
+  type Scene,
+  type Feature,
+} from "@starlight/types";
 import { elementDiff, getByPath, quoteList } from "./utils";
-import { Feature } from "../types/zigbee_features";
 
 const SUCCESS: OperationStatus = { success: true };
 

packages/types/zigbee_types.ts → packages/types/index.d.ts

@@ -1,8 +1,3 @@
-// SPDX-FileCopyrightText: © 2023 Amber Cronin <[email protected]>
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
-import { Feature } from "./zigbee_features";
-
 export interface Device {
   [index: string]: any;
   ieee_address: string;
@@ -113,3 +108,109 @@ export interface BridgeResponse {
   error?: string;
   data: any;
 }
+
+export type Feature =
+  | BinaryFeature
+  | EnumFeature
+  | NumericFeature
+  | CompositeFeature
+  | ListFeature
+  | TextFeature
+  | LockStateEnumFeature
+  | LockFeature
+  | FanFeature
+  | CoverFeature
+  | SwitchFeature
+  | ClimateFeature;
+
+interface BaseFeature {
+  access?: 1 | 2 | 5 | 7;
+  description?: string;
+  name: string;
+  type: string;
+  property?: string;
+}
+
+interface FeaturePreset {
+  description: string;
+  name: string;
+  value: number; // check this
+}
+
+/**
+ * Generic Features
+ */
+
+interface BinaryFeature extends BaseFeature {
+  type: "binary";
+  value_on: string | boolean;
+  value_off: string | boolean;
+  value_toggle?: string | boolean;
+}
+
+interface NumericFeature extends BaseFeature {
+  type: "numeric";
+  value_max?: number;
+  value_min?: number;
+  value_step?: number;
+  unit?: string;
+  presets?: FeaturePreset[];
+}
+
+interface EnumFeature extends BaseFeature {
+  type: "enum";
+  values: any[];
+}
+
+interface ListFeature extends BaseFeature {
+  type: "list";
+  length_min?: number;
+  length_max?: number;
+  item_type: Feature[];
+}
+
+interface TextFeature extends BaseFeature {
+  type: "text";
+  property: string;
+}
+
+interface CompositeFeature extends BaseFeature {
+  type: "composite";
+  property: string;
+  features: BinaryFeature[] | NumericFeature[] | EnumFeature[];
+}
+
+/**
+ * Specific Features
+ */
+
+interface LockFeature extends BaseFeature {
+  type: "lock";
+  features: LockStateEnumFeature[] | BinaryFeature[];
+}
+
+interface LockStateEnumFeature extends EnumFeature {
+  name: "lock_state";
+  property: "lock_state";
+  values: string[];
+}
+
+interface FanFeature extends BaseFeature {
+  type: "fan";
+  features: BinaryFeature[] | EnumFeature[];
+}
+
+interface CoverFeature extends BaseFeature {
+  type: "cover";
+  features: BinaryFeature[] | NumericFeature[];
+}
+
+interface SwitchFeature extends BaseFeature {
+  type: "switch";
+  features: BinaryFeature[];
+}
+
+interface ClimateFeature extends BaseFeature {
+  type: "climate";
+  features: Feature[]; // TODO https://www.zigbee2mqtt.io/guide/usage/exposes.html#climate
+}

packages/types/package.json

@@ -1,8 +1,5 @@
 {
   "name": "@starlight/types",
   "packageManager": "[email protected]",
-  "private": true,
-  "workspaces": [
-    "packages/*"
-  ]
+  "private": true
 }

packages/types/tsconfig.json

@@ -0,0 +1,6 @@
+{
+  "compilerOptions": {
+    "module": "node16"
+  },
+  "files": ["index.d.ts"]
+}