Merge pull request #972 from keesschollaart81/dev

keesschollaart81 · Feb 6, 2021 · c864acc · c864acc
2 parents 459d91b + 247d3d1
commit c864acc
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 27 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "vscode-home-assistant",
   "displayName": "Home Assistant Config Helper",
   "description": " Completion for entity-id's in Home Assistant Configurations",
-  "version": "1.14.0",
+  "version": "1.14.1",
   "preview": false,
   "engines": {
     "vscode": "^1.45.1"
@@ -316,7 +316,7 @@
   },
   "devDependencies": {
     "@types/mocha": "8.2.0",
-    "@types/node": "14.14.22",
+    "@types/node": "14.14.25",
     "@types/request": "2.48.5",
     "@types/vscode": "1.45.1",
     "@types/ws": "7.4.0",
@@ -355,7 +355,7 @@
     "vscode-languageserver-protocol": "3.15.3",
     "vscode-languageserver-textdocument": "^1.0.1",
     "vscode-uri": "3.0.2",
-    "ws": "7.4.2",
+    "ws": "7.4.3",
     "yaml": "1.10.0",
     "yaml-language-server": "0.12.0"
   }

diff --git a/src/language-service/package-lock.json b/src/language-service/package-lock.json
diff --git a/src/language-service/package.json b/src/language-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "home-assistant-language-service",
-  "version": "1.14.0",
+  "version": "1.14.1",
   "description": "Home Assistant Language Service",
   "source": "src/haLanguageService.ts",
   "main": "dist/haLanguageService.js",
@@ -39,7 +39,7 @@
   },
   "devDependencies": {
     "@types/mocha": "8.2.0",
-    "@types/node": "14.14.22",
+    "@types/node": "14.14.25",
     "@types/vscode": "1.48.0",
     "@types/ws": "7.4.0",
     "@types/yaml": "1.9.7",
@@ -70,7 +70,7 @@
     "vscode-json-languageservice": "3.9.1",
     "vscode-languageserver-protocol": "3.15.3",
     "vscode-uri": "3.0.2",
-    "ws": "7.4.2",
+    "ws": "7.4.3",
     "yaml": "1.10.0",
     "yaml-language-server": "0.12.0"
   },

diff --git a/src/language-service/src/schemas/integrations/triggers.ts b/src/language-service/src/schemas/integrations/triggers.ts
@@ -6,6 +6,7 @@ import {
   Data,
   Entities,
   InputDatetimeEntities,
+  InputNumberEntity,
   Template,
   TimePeriod,
   ZoneEntity,
@@ -191,13 +192,13 @@ interface NumericStateTrigger {
    * Fire this trigger if the numeric state of the monitored entity (or entities) is changing from above to below the given threshold.
    * https://www.home-assistant.io/docs/automation/trigger/#numeric-state-trigger
    */
-  below?: number;
+  below?: number | InputNumberEntity;
 
   /**
    * Fire this trigger if the numeric state of the monitored entity (or entities) is changing from below to above the given threshold.
    * https://www.home-assistant.io/docs/automation/trigger/#numeric-state-trigger
    */
-  above?: number;
+  above?: number | InputNumberEntity;
 
   /**
    * An optional value template to use as the numeric state value.

diff --git a/src/language-service/src/schemas/lovelace/cards/calendar.ts b/src/language-service/src/schemas/lovelace/cards/calendar.ts
@@ -18,7 +18,7 @@ export interface Schema {
    * A list of calendar entities that will be displayed in the card.
    * https://www.home-assistant.io/lovelace/calendar/#entities
    */
-  entities: Entity[];
+  entities?: Entity[];
 
   /**
    * The view that will show first when the card is loaded onto the page.

diff --git a/src/language-service/src/schemas/lovelace/cards/entities.ts b/src/language-service/src/schemas/lovelace/cards/entities.ts
@@ -22,7 +22,7 @@ export interface Schema {
    * A list of entity IDs or entity (row) objects.
    * https://www.home-assistant.io/lovelace/entities/#entities
    */
-  entities: Entity[];
+  entities?: Entity[];
 
   /**
    * Header widget to render.

diff --git a/src/language-service/src/schemas/lovelace/cards/glance.ts b/src/language-service/src/schemas/lovelace/cards/glance.ts
@@ -29,7 +29,7 @@ export interface Schema {
    * A list of entity IDs or entity objects.
    * https://www.home-assistant.io/lovelace/glance/#entities
    */
-  entities: Entity[];
+  entities?: Entity[];
 
   /**
    * Show entity icon.

diff --git a/src/language-service/src/schemas/lovelace/cards/logbook.ts b/src/language-service/src/schemas/lovelace/cards/logbook.ts
@@ -18,7 +18,7 @@ export interface Schema {
    * The entities that will show in the card.
    * https://www.home-assistant.io/lovelace/logbook/#entities
    */
-  entities: Entity[];
+  entities?: Entity[];
 
   /**
    * Number of hours in the past to track.

diff --git a/src/language-service/src/schemas/lovelace/cards/map.ts b/src/language-service/src/schemas/lovelace/cards/map.ts
@@ -26,7 +26,7 @@ export interface Schema {
    * List of entity IDs. Either this or the geo_location_sources configuration option is required.
    * https://www.home-assistant.io/lovelace/map/#entities
    */
-  entities: Entity | Entity[];
+  entities?: Entity | Entity[];
 
   /**
    * List of geolocation sources. All current entities with that source will be displayed on the map. See Geolocation platform for valid sources. Set to all to use all available sources. Either this or the entities configuration option is required.