+ s = c;}return this.config.aspect_ratio ? (a["--aspect-ratio"] = this.config.aspect_ratio, s.position = "absolute") : a.display = "inline", this.style.setProperty("--button-card-light-color", this._getColorForLightEntity(t, !0)), this.style.setProperty("--button-card-light-color-no-temperature", this._getColorForLightEntity(t, !1)), r = Object.assign({}, r, o), $`
+
- ${this._getLock(s)}
+ ${this._getLock(r)}
${this._buttonContent(t, e, i)}
- ${this.config.lock ? "" : R`
`;
}_getLock(t) {
- return this.config.lock ? R`
-
+ return this.config.lock ? $`
+
+ p = this._buildStyleGeneric(t, e, "grid");return a || o.push("no-icon"), s || o.push("no-name"), r || o.push("no-state"), c || u || o.push("no-label"), $`
+ {
+ const value = this.config!.custom_fields![key];
+ fields[key] = this._getTemplateOrString(state, value);
+ });
+ }
+ if (configState && configState.custom_fields) {
+ Object.keys(configState.custom_fields).forEach((key) => {
+ const value = configState!.custom_fields![key];
+ fields[key] = this._getTemplateOrString(state, value);
+ });
+ }
+ Object.keys(fields).forEach((key) => {
+ if (fields[key] != undefined) {
+ const customStyle: StyleInfo = {
+ ...this._buildCustomStyleGeneric(state, configState, key),
+ 'grid-area': key,
+ };
+ result = html`${result}
+
`;
}
@@ -657,10 +709,10 @@ class ButtonCard extends LitElement {
): TemplateResult | undefined {
const icon = this._buildIcon(state, configState);
const entityPicture = this._buildEntityPicture(state, configState);
- const entityPictureStyleFromConfig = this._buildStyleGeneric(configState, 'entity_picture');
- const haIconStyleFromConfig = this._buildStyleGeneric(configState, 'icon');
- const imgCellStyleFromConfig = this._buildStyleGeneric(configState, 'img_cell');
- const haCardStyleFromConfig = this._buildStyleGeneric(configState, 'card');
+ const entityPictureStyleFromConfig = this._buildStyleGeneric(state, configState, 'entity_picture');
+ const haIconStyleFromConfig = this._buildStyleGeneric(state, configState, 'icon');
+ const imgCellStyleFromConfig = this._buildStyleGeneric(state, configState, 'img_cell');
+ const haCardStyleFromConfig = this._buildStyleGeneric(state, configState, 'card');
const haIconStyle: StyleInfo = {
color,
@@ -698,7 +750,10 @@ class ButtonCard extends LitElement {
let mergedStateConfig: StateConfig[] | undefined = config.state;
while (tplName && ll.config.button_card_templates && ll.config.button_card_templates[tplName]) {
template = mergeDeep(ll.config.button_card_templates[tplName], template);
- mergedStateConfig = mergeStatesById((ll.config.button_card_templates[tplName] as ButtonCardConfig).state, mergedStateConfig);
+ mergedStateConfig = mergeStatesById(
+ (ll.config.button_card_templates[tplName] as ButtonCardConfig).state,
+ mergedStateConfig,
+ );
tplName = (ll.config.button_card_templates[tplName] as ButtonCardConfig).template;
}
template.state = mergedStateConfig;
@@ -724,6 +779,10 @@ class ButtonCard extends LitElement {
this.config!.color_off = 'var(--paper-item-icon-color)';
}
this.config!.color_on = 'var(--paper-item-icon-active-color)';
+
+ const jsonConfig = JSON.stringify(this.config);
+ const rxp = new RegExp('\\[\\[\\[.*\\]\\]\\]', 'gm');
+ this._hasTemplate = jsonConfig.match(rxp) ? true : false;
}
// The height of your card. Home Assistant uses this to automatically
@@ -732,6 +791,25 @@ class ButtonCard extends LitElement {
return 3;
}
+ private _evalActions(config: ButtonCardConfig, action: string): ButtonCardConfig {
+ const state = this.config!.entity ? this.hass!.states[this.config!.entity] : undefined;
+ const configDuplicate = JSON.parse(JSON.stringify(config));
+ Object.keys(configDuplicate![action]).forEach((key) => {
+ if (key === 'service_data') {
+ Object.keys(configDuplicate![action].service_data).forEach((sdKey) => {
+ configDuplicate![action].service_data[sdKey] = this._getTemplateOrString(
+ state, configDuplicate![action].service_data[sdKey],
+ );
+ });
+ } else {
+ configDuplicate![action][key] = this._getTemplateOrString(
+ state, configDuplicate![action][key],
+ );
+ }
+ });
+ return configDuplicate;
+ }
+
private _handleTap(ev): void {
/* eslint no-alert: 0 */
if (this.config!.confirmation
@@ -739,7 +817,7 @@ class ButtonCard extends LitElement {
return;
}
const config = ev.target.config;
- handleClick(this, this.hass!, config, false, false);
+ handleClick(this, this.hass!, this._evalActions(config, 'tap_action'), false, false);
}
private _handleHold(ev): void {
@@ -749,7 +827,7 @@ class ButtonCard extends LitElement {
return;
}
const config = ev.target.config;
- handleClick(this, this.hass!, config, true, false);
+ handleClick(this, this.hass!, this._evalActions(config, 'hold_action'), true, false);
}
private _handleDblTap(ev): void {
@@ -759,7 +837,7 @@ class ButtonCard extends LitElement {
return;
}
const config = ev.target.config;
- handleClick(this, this.hass!, config, false, true);
+ handleClick(this, this.hass!, this._evalActions(config, 'dbltap_action'), false, true);
}
private _handleLock(ev): void {
diff --git a/src/compute_state_display.ts b/src/compute_state_display.ts
index bf8bf31..cbd775c 100644
--- a/src/compute_state_display.ts
+++ b/src/compute_state_display.ts
@@ -1,6 +1,6 @@
import { HassEntity } from 'home-assistant-js-websocket';
-import { computeDomain } from './helpers';
import { LocalizeFunc } from 'custom-card-helpers';
+import { computeDomain } from './helpers';
export default (
localize: LocalizeFunc,
diff --git a/src/helpers.ts b/src/helpers.ts
index 94abdb0..93930a2 100644
--- a/src/helpers.ts
+++ b/src/helpers.ts
@@ -139,13 +139,20 @@ export function mergeStatesById(
fromStates.forEach((fromState) => {
if (fromState.id && intoState.id && fromState.id == intoState.id)
localState = mergeDeep(localState, fromState);
- })
+ });
}
resultStateConfigs.push(localState);
});
}
if (fromStates) {
- resultStateConfigs = resultStateConfigs.concat(fromStates.filter(x => !intoStates ? true : !intoStates.find(y => y.id && x.id ? y.id == x.id : false)));
+ /* eslint eqeqeq: 0 no-confusing-arrow: 0 */
+ resultStateConfigs = resultStateConfigs.concat(
+ fromStates.filter(
+ x => !intoStates
+ ? true
+ : !intoStates.find(y => y.id && x.id ? y.id == x.id : false),
+ ),
+ );
}
return resultStateConfigs;
-}
\ No newline at end of file
+}
diff --git a/src/long-press.ts b/src/long-press.ts
index f219c1c..08f1208 100644
--- a/src/long-press.ts
+++ b/src/long-press.ts
@@ -105,6 +105,7 @@ class LongPress extends HTMLElement implements LongPress {
});
const clickStart = (ev: Event) => {
+ ev.stopPropagation();
if (this.cooldownStart) {
return;
}
@@ -134,6 +135,7 @@ class LongPress extends HTMLElement implements LongPress {
};
const clickEnd = (ev: Event) => {
+ ev.stopPropagation();
if (
this.cooldownEnd
|| (['touchend', 'touchcancel'].includes(ev.type)
diff --git a/src/types.ts b/src/types.ts
index 37385e1..651ff54 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -5,7 +5,6 @@ export interface ButtonCardConfig {
type: string;
entity?: string;
name?: string;
- name_template?: string;
icon?: string;
color_type: 'icon' | 'card' | 'label-card' | 'blank-card'
color?: 'auto' | 'auto-no-temperature' | string;
@@ -24,19 +23,17 @@ export interface ButtonCardConfig {
show_last_changed?: boolean;
show_label?: boolean;
label?: string;
- label_template?: string;
entity_picture?: string;
- entity_picture_template?: string;
units?: string;
state?: StateConfig[];
styles?: StylesConfig;
confirmation?: string;
layout: Layout;
entity_picture_style?: CssStyleConfig[];
-
default_color: string;
color_on: string;
color_off: string;
+ custom_fields?: CustomFields;
}
export type Layout = 'vertical'
@@ -53,16 +50,14 @@ export interface StateConfig {
operator?: '<' | '<=' | '==' | '>=' | '>' | '!=' | 'regex' | 'template' | 'default';
value?: any;
name?: string;
- name_template?: string;
icon?: string;
color?: 'auto' | 'auto-no-temperature' | string;
entity_picture_style?: CssStyleConfig[];
entity_picture?: string;
- entity_picture_template?: string;
styles?: StylesConfig;
spin?: boolean;
label?: string;
- label_template?: string;
+ custom_fields?: CustomFields;
}
export interface StylesConfig {
@@ -75,8 +70,17 @@ export interface StylesConfig {
grid?: CssStyleConfig[];
img_cell?: CssStyleConfig[];
lock?: CssStyleConfig[];
+ custom_fields?: CustomStyleConfig;
+}
+
+export interface CustomStyleConfig {
+ [key: string]: CssStyleConfig[];
}
export interface CssStyleConfig {
[key: string]: any;
}
+
+export interface CustomFields {
+ [key: string]: any;
+}
${a || ""}
- ${r ? R`
`;
}_getIconHtml(t, e, n) {
const i = this._buildIcon(t, e),
- r = this._buildEntityPicture(t, e),
- s = this._buildStyleGeneric(e, "entity_picture"),
- a = this._buildStyleGeneric(e, "icon"),
- o = this._buildStyleGeneric(e, "img_cell"),
- l = this._buildStyleGeneric(e, "card"),
- c = Object.assign({ color: n, width: this.config.size, position: this.config.aspect_ratio || l.height ? "absolute" : "relative" }, a),
- h = Object.assign({}, c, s);return i || r ? R`
- ${dt(r)}
` : ""}
- ${s ? R`${s}
` : ""}
- ${l && !u ? R`${dt(l)}
` : ""}
+ ${s ? $`${ut(s)}
` : ""}
+ ${r ? $`${r}
` : ""}
+ ${c && !u ? $`${ut(c)}
` : ""}
${u || ""}
+ ${this._buildCustomFields(t, e)}
- ${i && !r ? R`
+ ${i && !s ? $`
` : ""}
` : void 0;
@@ -1702,29 +1723,37 @@ window.navigator.userAgent.match("Trident") && (DOMTokenList.prototype.toggle =
}return null;
}();let n = Object.assign({}, t),
i = n.template,
- r = t.state;for (; i && e.config.button_card_templates && e.config.button_card_templates[i];) n = de(e.config.button_card_templates[i], n), r = ue(e.config.button_card_templates[i].state, r), i = e.config.button_card_templates[i].template;n.state = r, this.config = Object.assign({ tap_action: { action: "toggle" }, hold_action: { action: "none" }, dbltap_action: { action: "none" }, layout: "vertical", size: "40%", color_type: "icon", show_name: !0, show_state: !1, show_icon: !0, show_units: !0, show_label: !1, show_entity_picture: !1 }, n), this.config.default_color = "var(--primary-text-color)", "icon" !== this.config.color_type ? this.config.color_off = "var(--paper-card-background-color)" : this.config.color_off = "var(--paper-item-icon-color)", this.config.color_on = "var(--paper-item-icon-active-color)";
+ s = t.state;for (; i && e.config.button_card_templates && e.config.button_card_templates[i];) n = de(e.config.button_card_templates[i], n), s = ue(e.config.button_card_templates[i].state, s), i = e.config.button_card_templates[i].template;n.state = s, this.config = Object.assign({ tap_action: { action: "toggle" }, hold_action: { action: "none" }, dbltap_action: { action: "none" }, layout: "vertical", size: "40%", color_type: "icon", show_name: !0, show_state: !1, show_icon: !0, show_units: !0, show_label: !1, show_entity_picture: !1 }, n), this.config.default_color = "var(--primary-text-color)", "icon" !== this.config.color_type ? this.config.color_off = "var(--paper-card-background-color)" : this.config.color_off = "var(--paper-item-icon-color)", this.config.color_on = "var(--paper-item-icon-active-color)";const r = JSON.stringify(this.config),
+ a = new RegExp("\\[\\[\\[.*\\]\\]\\]", "gm");this._hasTemplate = !!r.match(a);
}getCardSize() {
return 3;
+ }_evalActions(t, e) {
+ const n = this.config.entity ? this.hass.states[this.config.entity] : void 0,
+ i = JSON.parse(JSON.stringify(t));return Object.keys(i[e]).forEach(t => {
+ "service_data" === t ? Object.keys(i[e].service_data).forEach(t => {
+ i[e].service_data[t] = this._getTemplateOrString(n, i[e].service_data[t]);
+ }) : i[e][t] = this._getTemplateOrString(n, i[e][t]);
+ }), i;
}_handleTap(t) {
- if (this.config.confirmation && !window.confirm(this.config.confirmation)) return;const e = t.target.config;Lt(this, this.hass, e, !1, !1);
+ if (this.config.confirmation && !window.confirm(this.config.confirmation)) return;const e = t.target.config;jt(this, this.hass, this._evalActions(e, "tap_action"), !1, !1);
}_handleHold(t) {
- if (this.config.confirmation && !window.confirm(this.config.confirmation)) return;const e = t.target.config;Lt(this, this.hass, e, !0, !1);
+ if (this.config.confirmation && !window.confirm(this.config.confirmation)) return;const e = t.target.config;jt(this, this.hass, this._evalActions(e, "hold_action"), !0, !1);
}_handleDblTap(t) {
- if (this.config.confirmation && !window.confirm(this.config.confirmation)) return;const e = t.target.config;Lt(this, this.hass, e, !1, !0);
+ if (this.config.confirmation && !window.confirm(this.config.confirmation)) return;const e = t.target.config;jt(this, this.hass, this._evalActions(e, "dbltap_action"), !1, !0);
}_handleLock(t) {
if (t.stopPropagation(), this.config.unlock_users) {
if (!this.hass.user.name) return;if (this.config.unlock_users.indexOf(this.hass.user.name) < 0) return;
}const e = this.shadowRoot.getElementById("overlay"),
n = this.shadowRoot.getElementById("card");e.style.setProperty("pointer-events", "none");const i = document.createElement("paper-ripple"),
- r = this.shadowRoot.getElementById("lock");if (r) {
- n.appendChild(i);const t = document.createAttribute("icon");t.value = "mdi:lock-open-outline", r.attributes.setNamedItem(t), r.classList.add("fadeOut");
+ s = this.shadowRoot.getElementById("lock");if (s) {
+ n.appendChild(i);const t = document.createAttribute("icon");t.value = "mdi:lock-open-outline", s.attributes.setNamedItem(t), s.classList.add("fadeOut");
}window.setTimeout(() => {
- if (e.style.setProperty("pointer-events", ""), r) {
- r.classList.remove("fadeOut");const t = document.createAttribute("icon");t.value = "mdi:lock-outline", r.attributes.setNamedItem(t), n.removeChild(i);
+ if (e.style.setProperty("pointer-events", ""), s) {
+ s.classList.remove("fadeOut");const t = document.createAttribute("icon");t.value = "mdi:lock-outline", s.attributes.setNamedItem(t), n.removeChild(i);
}
}, 5e3);
}
-};t([et()], fe.prototype, "hass", void 0), t([et()], fe.prototype, "config", void 0), t([et()], fe.prototype, "_timeRemaining", void 0), fe = t([(t => e => "function" == typeof e ? ((t, e) => (window.customElements.define(t, e), e))(t, e) : ((t, e) => {
+};t([it()], fe.prototype, "hass", void 0), t([it()], fe.prototype, "config", void 0), t([it()], fe.prototype, "_timeRemaining", void 0), t([it()], fe.prototype, "_hasTemplate", void 0), fe = t([(t => e => "function" == typeof e ? ((t, e) => (window.customElements.define(t, e), e))(t, e) : ((t, e) => {
const { kind: n, elements: i } = e;return { kind: n, elements: i, finisher(e) {
window.customElements.define(t, e);
} };
diff --git a/examples/custom_fields_1.gif b/examples/custom_fields_1.gif
new file mode 100644
index 0000000..a27197f
Binary files /dev/null and b/examples/custom_fields_1.gif differ
diff --git a/examples/custom_fields_2.png b/examples/custom_fields_2.png
new file mode 100644
index 0000000..f73edac
Binary files /dev/null and b/examples/custom_fields_2.png differ
diff --git a/package-lock.json b/package-lock.json
index bb532dc..2689518 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "button-card",
- "version": "1.11.1",
+ "version": "2.0.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -14,25 +14,89 @@
}
},
"@babel/core": {
- "version": "7.4.4",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.4.4.tgz",
- "integrity": "sha512-lQgGX3FPRgbz2SKmhMtYgJvVzGZrmjaF4apZ2bLwofAKiSjxU0drPh4S/VasyYXwaTs+A1gvQ45BN8SQJzHsQQ==",
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz",
+ "integrity": "sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==",
"dev": true,
"requires": {
- "@babel/code-frame": "^7.0.0",
- "@babel/generator": "^7.4.4",
- "@babel/helpers": "^7.4.4",
- "@babel/parser": "^7.4.4",
+ "@babel/code-frame": "^7.5.5",
+ "@babel/generator": "^7.5.5",
+ "@babel/helpers": "^7.5.5",
+ "@babel/parser": "^7.5.5",
"@babel/template": "^7.4.4",
- "@babel/traverse": "^7.4.4",
- "@babel/types": "^7.4.4",
+ "@babel/traverse": "^7.5.5",
+ "@babel/types": "^7.5.5",
"convert-source-map": "^1.1.0",
"debug": "^4.1.0",
"json5": "^2.1.0",
- "lodash": "^4.17.11",
+ "lodash": "^4.17.13",
"resolve": "^1.3.2",
"semver": "^5.4.1",
"source-map": "^0.5.0"
+ },
+ "dependencies": {
+ "@babel/code-frame": {
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
+ "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
+ "dev": true,
+ "requires": {
+ "@babel/highlight": "^7.0.0"
+ }
+ },
+ "@babel/generator": {
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz",
+ "integrity": "sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.5.5",
+ "jsesc": "^2.5.1",
+ "lodash": "^4.17.13",
+ "source-map": "^0.5.0",
+ "trim-right": "^1.0.1"
+ }
+ },
+ "@babel/parser": {
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz",
+ "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==",
+ "dev": true
+ },
+ "@babel/traverse": {
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz",
+ "integrity": "sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.5.5",
+ "@babel/generator": "^7.5.5",
+ "@babel/helper-function-name": "^7.1.0",
+ "@babel/helper-split-export-declaration": "^7.4.4",
+ "@babel/parser": "^7.5.5",
+ "@babel/types": "^7.5.5",
+ "debug": "^4.1.0",
+ "globals": "^11.1.0",
+ "lodash": "^4.17.13"
+ }
+ },
+ "@babel/types": {
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz",
+ "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==",
+ "dev": true,
+ "requires": {
+ "esutils": "^2.0.2",
+ "lodash": "^4.17.13",
+ "to-fast-properties": "^2.0.0"
+ }
+ },
+ "lodash": {
+ "version": "4.17.15",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+ "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+ "dev": true
+ }
}
},
"@babel/generator": {
@@ -137,14 +201,78 @@
}
},
"@babel/helpers": {
- "version": "7.4.4",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.4.4.tgz",
- "integrity": "sha512-igczbR/0SeuPR8RFfC7tGrbdTbFL3QTvH6D+Z6zNxnTe//GyqmtHmDkzrqDmyZ3eSwPqB/LhyKoU5DXsp+Vp2A==",
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.5.5.tgz",
+ "integrity": "sha512-nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g==",
"dev": true,
"requires": {
"@babel/template": "^7.4.4",
- "@babel/traverse": "^7.4.4",
- "@babel/types": "^7.4.4"
+ "@babel/traverse": "^7.5.5",
+ "@babel/types": "^7.5.5"
+ },
+ "dependencies": {
+ "@babel/code-frame": {
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
+ "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
+ "dev": true,
+ "requires": {
+ "@babel/highlight": "^7.0.0"
+ }
+ },
+ "@babel/generator": {
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz",
+ "integrity": "sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.5.5",
+ "jsesc": "^2.5.1",
+ "lodash": "^4.17.13",
+ "source-map": "^0.5.0",
+ "trim-right": "^1.0.1"
+ }
+ },
+ "@babel/parser": {
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz",
+ "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==",
+ "dev": true
+ },
+ "@babel/traverse": {
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz",
+ "integrity": "sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.5.5",
+ "@babel/generator": "^7.5.5",
+ "@babel/helper-function-name": "^7.1.0",
+ "@babel/helper-split-export-declaration": "^7.4.4",
+ "@babel/parser": "^7.5.5",
+ "@babel/types": "^7.5.5",
+ "debug": "^4.1.0",
+ "globals": "^11.1.0",
+ "lodash": "^4.17.13"
+ }
+ },
+ "@babel/types": {
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz",
+ "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==",
+ "dev": true,
+ "requires": {
+ "esutils": "^2.0.2",
+ "lodash": "^4.17.13",
+ "to-fast-properties": "^2.0.0"
+ }
+ },
+ "lodash": {
+ "version": "4.17.15",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+ "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+ "dev": true
+ }
}
},
"@babel/highlight": {
@@ -165,13 +293,112 @@
"dev": true
},
"@babel/plugin-proposal-class-properties": {
- "version": "7.4.4",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.4.4.tgz",
- "integrity": "sha512-WjKTI8g8d5w1Bc9zgwSz2nfrsNQsXcCf9J9cdCvrJV6RF56yztwm4TmJC0MgJ9tvwO9gUA/mcYe89bLdGfiXFg==",
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz",
+ "integrity": "sha512-AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A==",
"dev": true,
"requires": {
- "@babel/helper-create-class-features-plugin": "^7.4.4",
+ "@babel/helper-create-class-features-plugin": "^7.5.5",
"@babel/helper-plugin-utils": "^7.0.0"
+ },
+ "dependencies": {
+ "@babel/code-frame": {
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
+ "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
+ "dev": true,
+ "requires": {
+ "@babel/highlight": "^7.0.0"
+ }
+ },
+ "@babel/generator": {
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz",
+ "integrity": "sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.5.5",
+ "jsesc": "^2.5.1",
+ "lodash": "^4.17.13",
+ "source-map": "^0.5.0",
+ "trim-right": "^1.0.1"
+ }
+ },
+ "@babel/helper-create-class-features-plugin": {
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz",
+ "integrity": "sha512-ZsxkyYiRA7Bg+ZTRpPvB6AbOFKTFFK4LrvTet8lInm0V468MWCaSYJE+I7v2z2r8KNLtYiV+K5kTCnR7dvyZjg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-function-name": "^7.1.0",
+ "@babel/helper-member-expression-to-functions": "^7.5.5",
+ "@babel/helper-optimise-call-expression": "^7.0.0",
+ "@babel/helper-plugin-utils": "^7.0.0",
+ "@babel/helper-replace-supers": "^7.5.5",
+ "@babel/helper-split-export-declaration": "^7.4.4"
+ }
+ },
+ "@babel/helper-member-expression-to-functions": {
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz",
+ "integrity": "sha512-5qZ3D1uMclSNqYcXqiHoA0meVdv+xUEex9em2fqMnrk/scphGlGgg66zjMrPJESPwrFJ6sbfFQYUSa0Mz7FabA==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "^7.5.5"
+ }
+ },
+ "@babel/helper-replace-supers": {
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz",
+ "integrity": "sha512-XvRFWrNnlsow2u7jXDuH4jDDctkxbS7gXssrP4q2nUD606ukXHRvydj346wmNg+zAgpFx4MWf4+usfC93bElJg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-member-expression-to-functions": "^7.5.5",
+ "@babel/helper-optimise-call-expression": "^7.0.0",
+ "@babel/traverse": "^7.5.5",
+ "@babel/types": "^7.5.5"
+ }
+ },
+ "@babel/parser": {
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz",
+ "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==",
+ "dev": true
+ },
+ "@babel/traverse": {
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz",
+ "integrity": "sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "^7.5.5",
+ "@babel/generator": "^7.5.5",
+ "@babel/helper-function-name": "^7.1.0",
+ "@babel/helper-split-export-declaration": "^7.4.4",
+ "@babel/parser": "^7.5.5",
+ "@babel/types": "^7.5.5",
+ "debug": "^4.1.0",
+ "globals": "^11.1.0",
+ "lodash": "^4.17.13"
+ }
+ },
+ "@babel/types": {
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz",
+ "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==",
+ "dev": true,
+ "requires": {
+ "esutils": "^2.0.2",
+ "lodash": "^4.17.13",
+ "to-fast-properties": "^2.0.0"
+ }
+ },
+ "lodash": {
+ "version": "4.17.15",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+ "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+ "dev": true
+ }
}
},
"@babel/plugin-proposal-decorators": {
@@ -234,9 +461,9 @@
}
},
"@ctrl/tinycolor": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-2.4.0.tgz",
- "integrity": "sha512-ZLjdsst8/ENM6spDmh3qPQSM+iDSerTGjA05KhAXog7o/aOa9tn7qzWMeOtJzGaDMmsBLxh4IuZ5GH7nfda9gg=="
+ "version": "2.5.3",
+ "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-2.5.3.tgz",
+ "integrity": "sha512-tu0Xqhz0AI5LoU2yyz4asVAev4hzWt30dutbY6Nu7pKvLX0JP5p6NJ5uomwC/blhLMk88hVgXRODFlTB+c03Nw=="
},
"@emmetio/extract-abbreviation": {
"version": "0.1.6",
@@ -260,6 +487,12 @@
"integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
"dev": true
},
+ "@types/eslint-visitor-keys": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
+ "integrity": "sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==",
+ "dev": true
+ },
"@types/estree": {
"version": "0.0.39",
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
@@ -282,45 +515,44 @@
}
},
"@typescript-eslint/eslint-plugin": {
- "version": "1.9.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-1.9.0.tgz",
- "integrity": "sha512-FOgfBorxjlBGpDIw+0LaZIXRX6GEEUfzj8LXwaQIUCp+gDOvkI+1WgugJ7SmWiISqK9Vj5r8S7NDKO/LB+6X9A==",
+ "version": "1.12.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-1.12.0.tgz",
+ "integrity": "sha512-J/ZTZF+pLNqjXBGNfq5fahsoJ4vJOkYbitWPavA05IrZ7BXUaf4XWlhUB/ic1lpOGTRpLWF+PLAePjiHp6dz8g==",
"dev": true,
"requires": {
- "@typescript-eslint/experimental-utils": "1.9.0",
- "@typescript-eslint/parser": "1.9.0",
+ "@typescript-eslint/experimental-utils": "1.12.0",
"eslint-utils": "^1.3.1",
"functional-red-black-tree": "^1.0.1",
"regexpp": "^2.0.1",
- "requireindex": "^1.2.0",
"tsutils": "^3.7.0"
}
},
"@typescript-eslint/experimental-utils": {
- "version": "1.9.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-1.9.0.tgz",
- "integrity": "sha512-1s2dY9XxBwtS9IlSnRIlzqILPyeMly5tz1bfAmQ84Ul687xBBve5YsH5A5EKeIcGurYYqY2w6RkHETXIwnwV0A==",
+ "version": "1.12.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-1.12.0.tgz",
+ "integrity": "sha512-s0soOTMJloytr9GbPteMLNiO2HvJ+qgQkRNplABXiVw6vq7uQRvidkby64Gqt/nA7pys74HksHwRULaB/QRVyw==",
"dev": true,
"requires": {
- "@typescript-eslint/typescript-estree": "1.9.0"
+ "@typescript-eslint/typescript-estree": "1.12.0",
+ "eslint-scope": "^4.0.0"
}
},
"@typescript-eslint/parser": {
- "version": "1.9.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-1.9.0.tgz",
- "integrity": "sha512-CWgC1XrQ34H/+LwAU7vY5xteZDkNqeAkeidEpJnJgkKu0yqQ3ZhQ7S+dI6MX4vmmM1TKRbOrKuXc6W0fIHhdbA==",
+ "version": "1.12.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-1.12.0.tgz",
+ "integrity": "sha512-0uzbaa9ZLCA5yMWJywnJJ7YVENKGWVUhJDV5UrMoldC5HoI54W5kkdPhTfmtFKpPFp93MIwmJj0/61ztvmz5Dw==",
"dev": true,
"requires": {
- "@typescript-eslint/experimental-utils": "1.9.0",
- "@typescript-eslint/typescript-estree": "1.9.0",
- "eslint-scope": "^4.0.0",
+ "@types/eslint-visitor-keys": "^1.0.0",
+ "@typescript-eslint/experimental-utils": "1.12.0",
+ "@typescript-eslint/typescript-estree": "1.12.0",
"eslint-visitor-keys": "^1.0.0"
}
},
"@typescript-eslint/typescript-estree": {
- "version": "1.9.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-1.9.0.tgz",
- "integrity": "sha512-7Eg0TEQpCkTsEwsl1lIzd6i7L3pJLQFWesV08dS87bNz0NeSjbL78gNAP1xCKaCejkds4PhpLnZkaAjx9SU8OA==",
+ "version": "1.12.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-1.12.0.tgz",
+ "integrity": "sha512-nwN6yy//XcVhFs0ZyU+teJHB8tbCm7AIA8mu6E2r5hu6MajwYBY3Uwop7+rPZWUN/IUOHpL8C+iUPMDVYUU3og==",
"dev": true,
"requires": {
"lodash.unescape": "4.0.1",
@@ -1058,6 +1290,12 @@
"typedarray": "^0.0.6"
}
},
+ "confusing-browser-globals": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.7.tgz",
+ "integrity": "sha512-cgHI1azax5ATrZ8rJ+ODDML9Fvu67PimB6aNxBrc/QwSaDaM9eTfIEUHx3bBLJJ82ioSb+/5zfsMCCEJax3ByQ==",
+ "dev": true
+ },
"contains-path": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
@@ -1105,8 +1343,9 @@
}
},
"custom-card-helpers": {
- "version": "github:custom-cards/custom-card-helpers#80257d718895751356bc497496cd2b5c35f5327d",
- "from": "github:custom-cards/custom-card-helpers#fix-service-call",
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/custom-card-helpers/-/custom-card-helpers-1.2.2.tgz",
+ "integrity": "sha512-NWm6GUsRaH3CYzfVL8oRMHq6UrAs/JhY5+umPu6qkAoAG+HcW5fHz2Nni14k2SRearKfZb/Yvc5w6+tPYTYoJg==",
"requires": {
"fecha": "^3.0.3",
"home-assistant-js-websocket": "^4.1.2",
@@ -1342,14 +1581,14 @@
}
},
"eslint-config-airbnb-base": {
- "version": "13.1.0",
- "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.1.0.tgz",
- "integrity": "sha512-XWwQtf3U3zIoKO1BbHh6aUhJZQweOwSt4c2JrPDg9FP3Ltv3+YfEv7jIDB8275tVnO/qOHbfuYg3kzw6Je7uWw==",
+ "version": "13.2.0",
+ "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.2.0.tgz",
+ "integrity": "sha512-1mg/7eoB4AUeB0X1c/ho4vb2gYkNH8Trr/EgCT/aGmKhhG+F6vF5s8+iRBlWAzFIAphxIdp3YfEKgEl0f9Xg+w==",
"dev": true,
"requires": {
- "eslint-restricted-globals": "^0.1.1",
+ "confusing-browser-globals": "^1.0.5",
"object.assign": "^4.1.0",
- "object.entries": "^1.0.4"
+ "object.entries": "^1.1.0"
}
},
"eslint-import-resolver-node": {
@@ -1380,9 +1619,9 @@
}
},
"eslint-module-utils": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.4.0.tgz",
- "integrity": "sha512-14tltLm38Eu3zS+mt0KvILC3q8jyIAH518MlG+HO0p+yK885Lb1UHTY/UgR91eOyGdmxAPb+OLoW4znqIT6Ndw==",
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz",
+ "integrity": "sha512-H6DOj+ejw7Tesdgbfs4jeS4YMFrT8uI8xwd1gtQqXssaR0EQ26L+2O/w6wkYFy2MymON0fTwHmXBvvfLNZVZEw==",
"dev": true,
"requires": {
"debug": "^2.6.8",
@@ -1407,9 +1646,9 @@
}
},
"eslint-plugin-import": {
- "version": "2.17.2",
- "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.17.2.tgz",
- "integrity": "sha512-m+cSVxM7oLsIpmwNn2WXTJoReOF9f/CtLMo7qOVmKd1KntBy0hEcuNZ3erTmWjx+DxRO0Zcrm5KwAvI9wHcV5g==",
+ "version": "2.18.2",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz",
+ "integrity": "sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ==",
"dev": true,
"requires": {
"array-includes": "^3.0.3",
@@ -1419,10 +1658,10 @@
"eslint-import-resolver-node": "^0.3.2",
"eslint-module-utils": "^2.4.0",
"has": "^1.0.3",
- "lodash": "^4.17.11",
"minimatch": "^3.0.4",
+ "object.values": "^1.1.0",
"read-pkg-up": "^2.0.0",
- "resolve": "^1.10.0"
+ "resolve": "^1.11.0"
},
"dependencies": {
"debug": {
@@ -1452,12 +1691,6 @@
}
}
},
- "eslint-restricted-globals": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/eslint-restricted-globals/-/eslint-restricted-globals-0.1.1.tgz",
- "integrity": "sha1-NfDVy8ZMLj7WLpO0saevBbp+1Nc=",
- "dev": true
- },
"eslint-scope": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
@@ -3251,17 +3484,17 @@
}
},
"lit-element": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-2.1.0.tgz",
- "integrity": "sha512-0z/KHm1xZweivfOVRr8AKR06+D3k02u15m9s4jkuRdnGe5wfmEwePzrQQBsSZNILdnfJvfo3TJOeGhBCVZaPbw==",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-2.2.0.tgz",
+ "integrity": "sha512-Mzs3H7IO4wAnpzqreHw6dQqp9IG+h/oN8X9pgNbMZbE7x6B0aNOwP5Nveox/5HE+65ZfW2PeULEjoHkrwpTnuQ==",
"requires": {
"lit-html": "^1.0.0"
}
},
"lit-html": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-1.0.0.tgz",
- "integrity": "sha512-oeWlpLmBW3gFl7979Wol2LKITpmKTUFNn7PnFbh6YNynF61W74l6x5WhwItAwPRSATpexaX1egNnRzlN4GOtfQ=="
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-1.1.1.tgz",
+ "integrity": "sha512-1WqhkPpj+CKwLRXCCbyRGnWkcFKE4ft2+j8C2zaXwFUK9I2vYDzTuDGPh0H9hZcDBEwoe6YpPC8AO5734EPORQ=="
},
"load-json-file": {
"version": "2.0.0",
@@ -3286,9 +3519,9 @@
}
},
"lodash": {
- "version": "4.17.11",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
- "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+ "version": "4.17.15",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+ "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
"dev": true
},
"lodash.deburr": {
@@ -3403,9 +3636,9 @@
"dev": true
},
"mixin-deep": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
- "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+ "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
"dev": true,
"requires": {
"for-in": "^1.0.2",
@@ -3549,9 +3782,9 @@
}
},
"npm": {
- "version": "6.9.0",
- "resolved": "https://registry.npmjs.org/npm/-/npm-6.9.0.tgz",
- "integrity": "sha512-91V+zB5hDxO+Jyp2sUKS7juHlIM95dGQxTeQtmZI1nAI/7kjWXFipPrtwwKjhyKmV4GsS2LzJhrxRjGWsU9z/w==",
+ "version": "6.10.1",
+ "resolved": "https://registry.npmjs.org/npm/-/npm-6.10.1.tgz",
+ "integrity": "sha512-ejR83c5aPTip5hPhziypqkJu06vb5tDIugCXx1c5+04RbMjtZeMA6BfsuGnV9EBdEwzKoaHkQ9sJWQAq+LjHYw==",
"dev": true,
"requires": {
"JSONStream": "^1.3.5",
@@ -3561,11 +3794,11 @@
"aproba": "^2.0.0",
"archy": "~1.0.0",
"bin-links": "^1.1.2",
- "bluebird": "^3.5.3",
+ "bluebird": "^3.5.5",
"byte-size": "^5.0.1",
- "cacache": "^11.3.2",
- "call-limit": "~1.1.0",
- "chownr": "^1.1.1",
+ "cacache": "^11.3.3",
+ "call-limit": "^1.1.1",
+ "chownr": "^1.1.2",
"ci-info": "^2.0.0",
"cli-columns": "^3.1.2",
"cli-table3": "^0.5.1",
@@ -3582,25 +3815,25 @@
"fs-vacuum": "~1.2.10",
"fs-write-stream-atomic": "~1.0.10",
"gentle-fs": "^2.0.1",
- "glob": "^7.1.3",
- "graceful-fs": "^4.1.15",
+ "glob": "^7.1.4",
+ "graceful-fs": "^4.2.0",
"has-unicode": "~2.0.1",
"hosted-git-info": "^2.7.1",
"iferr": "^1.0.2",
"imurmurhash": "*",
"inflight": "~1.0.6",
- "inherits": "~2.0.3",
+ "inherits": "^2.0.4",
"ini": "^1.3.5",
"init-package-json": "^1.10.3",
"is-cidr": "^3.0.0",
"json-parse-better-errors": "^1.0.2",
"lazy-property": "~1.0.0",
- "libcipm": "^3.0.3",
- "libnpm": "^2.0.1",
+ "libcipm": "^4.0.0",
+ "libnpm": "^3.0.0",
"libnpmaccess": "*",
"libnpmhook": "^5.0.2",
"libnpmorg": "*",
- "libnpmsearch": "*",
+ "libnpmsearch": "^2.0.1",
"libnpmteam": "*",
"libnpx": "^10.2.0",
"lock-verify": "^2.1.0",
@@ -3616,53 +3849,53 @@
"lodash.union": "~4.6.0",
"lodash.uniq": "~4.5.0",
"lodash.without": "~4.4.0",
- "lru-cache": "^4.1.5",
+ "lru-cache": "^5.1.1",
"meant": "~1.0.1",
"mississippi": "^3.0.0",
"mkdirp": "~0.5.1",
"move-concurrently": "^1.0.1",
- "node-gyp": "^3.8.0",
+ "node-gyp": "^5.0.2",
"nopt": "~4.0.1",
"normalize-package-data": "^2.5.0",
"npm-audit-report": "^1.3.2",
"npm-cache-filename": "~1.0.2",
"npm-install-checks": "~3.0.0",
- "npm-lifecycle": "^2.1.0",
+ "npm-lifecycle": "^3.0.0",
"npm-package-arg": "^6.1.0",
- "npm-packlist": "^1.4.1",
+ "npm-packlist": "^1.4.4",
"npm-pick-manifest": "^2.2.3",
"npm-profile": "*",
- "npm-registry-fetch": "^3.9.0",
+ "npm-registry-fetch": "^3.9.1",
"npm-user-validate": "~1.0.0",
"npmlog": "~4.1.2",
"once": "~1.4.0",
"opener": "^1.5.1",
"osenv": "^0.1.5",
- "pacote": "^9.5.0",
+ "pacote": "^9.5.1",
"path-is-inside": "~1.0.2",
"promise-inflight": "~1.0.1",
"qrcode-terminal": "^0.12.0",
- "query-string": "^6.2.0",
+ "query-string": "^6.8.1",
"qw": "~1.0.1",
"read": "~1.0.7",
"read-cmd-shim": "~1.0.1",
"read-installed": "~4.0.3",
"read-package-json": "^2.0.13",
- "read-package-tree": "^5.2.2",
- "readable-stream": "^3.1.1",
- "readdir-scoped-modules": "*",
+ "read-package-tree": "^5.3.1",
+ "readable-stream": "^3.4.0",
+ "readdir-scoped-modules": "^1.1.0",
"request": "^2.88.0",
"retry": "^0.12.0",
"rimraf": "^2.6.3",
"safe-buffer": "^5.1.2",
- "semver": "^5.6.0",
- "sha": "~2.0.1",
+ "semver": "^5.7.0",
+ "sha": "^3.0.0",
"slide": "~1.1.6",
"sorted-object": "~2.0.1",
"sorted-union-stream": "~2.1.3",
"ssri": "^6.0.1",
"stringify-package": "^1.0.0",
- "tar": "^4.4.8",
+ "tar": "^4.4.10",
"text-table": "~0.2.0",
"tiny-relative-date": "^1.3.0",
"uid-number": "0.0.6",
@@ -3674,8 +3907,8 @@
"validate-npm-package-license": "^3.0.4",
"validate-npm-package-name": "~3.0.0",
"which": "^1.3.1",
- "worker-farm": "^1.6.0",
- "write-file-atomic": "^2.4.2"
+ "worker-farm": "^1.7.0",
+ "write-file-atomic": "^2.4.3"
},
"dependencies": {
"JSONStream": {
@@ -3852,16 +4085,8 @@
"write-file-atomic": "^2.3.0"
}
},
- "block-stream": {
- "version": "0.0.9",
- "bundled": true,
- "dev": true,
- "requires": {
- "inherits": "~2.0.0"
- }
- },
"bluebird": {
- "version": "3.5.3",
+ "version": "3.5.5",
"bundled": true,
"dev": true
},
@@ -3909,56 +4134,43 @@
"dev": true
},
"cacache": {
- "version": "11.3.2",
+ "version": "11.3.3",
"bundled": true,
"dev": true,
"requires": {
- "bluebird": "^3.5.3",
+ "bluebird": "^3.5.5",
"chownr": "^1.1.1",
"figgy-pudding": "^3.5.1",
- "glob": "^7.1.3",
+ "glob": "^7.1.4",
"graceful-fs": "^4.1.15",
"lru-cache": "^5.1.1",
"mississippi": "^3.0.0",
"mkdirp": "^0.5.1",
"move-concurrently": "^1.0.1",
"promise-inflight": "^1.0.1",
- "rimraf": "^2.6.2",
+ "rimraf": "^2.6.3",
"ssri": "^6.0.1",
"unique-filename": "^1.1.1",
"y18n": "^4.0.0"
},
"dependencies": {
- "chownr": {
- "version": "1.1.1",
- "bundled": true,
- "dev": true
- },
- "lru-cache": {
- "version": "5.1.1",
+ "glob": {
+ "version": "7.1.4",
"bundled": true,
"dev": true,
"requires": {
- "yallist": "^3.0.2"
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
}
- },
- "unique-filename": {
- "version": "1.1.1",
- "bundled": true,
- "dev": true,
- "requires": {
- "unique-slug": "^2.0.0"
- }
- },
- "yallist": {
- "version": "3.0.3",
- "bundled": true,
- "dev": true
}
}
},
"call-limit": {
- "version": "1.1.0",
+ "version": "1.1.1",
"bundled": true,
"dev": true
},
@@ -3988,7 +4200,7 @@
}
},
"chownr": {
- "version": "1.1.1",
+ "version": "1.1.2",
"bundled": true,
"dev": true
},
@@ -4227,6 +4439,22 @@
"lru-cache": "^4.0.1",
"shebang-command": "^1.2.0",
"which": "^1.2.9"
+ },
+ "dependencies": {
+ "lru-cache": {
+ "version": "4.1.5",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "pseudomap": "^1.0.2",
+ "yallist": "^2.1.2"
+ }
+ },
+ "yallist": {
+ "version": "2.1.2",
+ "bundled": true,
+ "dev": true
+ }
}
},
"crypto-random-string": {
@@ -4290,6 +4518,14 @@
"clone": "^1.0.2"
}
},
+ "define-properties": {
+ "version": "1.1.3",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "object-keys": "^1.0.12"
+ }
+ },
"delayed-stream": {
"version": "1.0.0",
"bundled": true,
@@ -4403,6 +4639,11 @@
"once": "^1.4.0"
}
},
+ "env-paths": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true
+ },
"err-code": {
"version": "1.1.2",
"bundled": true,
@@ -4416,6 +4657,28 @@
"prr": "~1.0.1"
}
},
+ "es-abstract": {
+ "version": "1.12.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "es-to-primitive": "^1.1.1",
+ "function-bind": "^1.1.1",
+ "has": "^1.0.1",
+ "is-callable": "^1.1.3",
+ "is-regex": "^1.0.4"
+ }
+ },
+ "es-to-primitive": {
+ "version": "1.2.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "is-callable": "^1.1.4",
+ "is-date-object": "^1.0.1",
+ "is-symbol": "^1.0.2"
+ }
+ },
"es6-promise": {
"version": "4.2.6",
"bundled": true,
@@ -4575,7 +4838,7 @@
}
},
"fs-minipass": {
- "version": "1.2.5",
+ "version": "1.2.6",
"bundled": true,
"dev": true,
"requires": {
@@ -4637,16 +4900,10 @@
"bundled": true,
"dev": true
},
- "fstream": {
- "version": "1.0.11",
+ "function-bind": {
+ "version": "1.1.1",
"bundled": true,
- "dev": true,
- "requires": {
- "graceful-fs": "^4.1.2",
- "inherits": "~2.0.0",
- "mkdirp": ">=0.5 0",
- "rimraf": "2"
- }
+ "dev": true
},
"gauge": {
"version": "2.7.4",
@@ -4734,7 +4991,7 @@
}
},
"glob": {
- "version": "7.1.3",
+ "version": "7.1.4",
"bundled": true,
"dev": true,
"requires": {
@@ -4780,7 +5037,7 @@
}
},
"graceful-fs": {
- "version": "4.1.15",
+ "version": "4.2.0",
"bundled": true,
"dev": true
},
@@ -4798,11 +5055,24 @@
"har-schema": "^2.0.0"
}
},
+ "has": {
+ "version": "1.0.3",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "function-bind": "^1.1.1"
+ }
+ },
"has-flag": {
"version": "3.0.0",
"bundled": true,
"dev": true
},
+ "has-symbols": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true
+ },
"has-unicode": {
"version": "2.0.1",
"bundled": true,
@@ -4895,7 +5165,7 @@
}
},
"inherits": {
- "version": "2.0.3",
+ "version": "2.0.4",
"bundled": true,
"dev": true
},
@@ -4934,6 +5204,11 @@
"bundled": true,
"dev": true
},
+ "is-callable": {
+ "version": "1.1.4",
+ "bundled": true,
+ "dev": true
+ },
"is-ci": {
"version": "1.1.0",
"bundled": true,
@@ -4957,6 +5232,11 @@
"cidr-regex": "^2.0.10"
}
},
+ "is-date-object": {
+ "version": "1.0.1",
+ "bundled": true,
+ "dev": true
+ },
"is-fullwidth-code-point": {
"version": "1.0.0",
"bundled": true,
@@ -4997,6 +5277,14 @@
"bundled": true,
"dev": true
},
+ "is-regex": {
+ "version": "1.0.4",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "has": "^1.0.1"
+ }
+ },
"is-retry-allowed": {
"version": "1.1.0",
"bundled": true,
@@ -5007,6 +5295,14 @@
"bundled": true,
"dev": true
},
+ "is-symbol": {
+ "version": "1.0.2",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "has-symbols": "^1.0.0"
+ }
+ },
"is-typedarray": {
"version": "1.0.0",
"bundled": true,
@@ -5091,7 +5387,7 @@
}
},
"libcipm": {
- "version": "3.0.3",
+ "version": "4.0.0",
"bundled": true,
"dev": true,
"requires": {
@@ -5103,7 +5399,7 @@
"ini": "^1.3.5",
"lock-verify": "^2.0.2",
"mkdirp": "^0.5.1",
- "npm-lifecycle": "^2.0.3",
+ "npm-lifecycle": "^3.0.0",
"npm-logical-tree": "^1.2.1",
"npm-package-arg": "^6.1.0",
"pacote": "^9.1.0",
@@ -5113,7 +5409,7 @@
}
},
"libnpm": {
- "version": "2.0.1",
+ "version": "3.0.0",
"bundled": true,
"dev": true,
"requires": {
@@ -5128,7 +5424,7 @@
"libnpmsearch": "^2.0.0",
"libnpmteam": "^1.0.1",
"lock-verify": "^2.0.2",
- "npm-lifecycle": "^2.1.0",
+ "npm-lifecycle": "^3.0.0",
"npm-logical-tree": "^1.2.1",
"npm-package-arg": "^6.1.0",
"npm-profile": "^4.0.1",
@@ -5185,7 +5481,7 @@
}
},
"p-limit": {
- "version": "2.1.0",
+ "version": "2.2.0",
"bundled": true,
"dev": true,
"requires": {
@@ -5201,7 +5497,7 @@
}
},
"p-try": {
- "version": "2.0.0",
+ "version": "2.2.0",
"bundled": true,
"dev": true
}
@@ -5253,7 +5549,7 @@
}
},
"libnpmsearch": {
- "version": "2.0.0",
+ "version": "2.0.1",
"bundled": true,
"dev": true,
"requires": {
@@ -5399,12 +5695,11 @@
"dev": true
},
"lru-cache": {
- "version": "4.1.5",
+ "version": "5.1.1",
"bundled": true,
"dev": true,
"requires": {
- "pseudomap": "^1.0.2",
- "yallist": "^2.1.2"
+ "yallist": "^3.0.2"
}
},
"make-dir": {
@@ -5416,16 +5711,16 @@
}
},
"make-fetch-happen": {
- "version": "4.0.1",
+ "version": "4.0.2",
"bundled": true,
"dev": true,
"requires": {
"agentkeepalive": "^3.4.1",
- "cacache": "^11.0.1",
+ "cacache": "^11.3.3",
"http-cache-semantics": "^3.8.1",
"http-proxy-agent": "^2.1.0",
"https-proxy-agent": "^2.2.1",
- "lru-cache": "^4.1.2",
+ "lru-cache": "^5.1.1",
"mississippi": "^3.0.0",
"node-fetch-npm": "^2.0.2",
"promise-retry": "^1.1.1",
@@ -5494,7 +5789,7 @@
}
},
"minizlib": {
- "version": "1.1.1",
+ "version": "1.2.1",
"bundled": true,
"dev": true,
"requires": {
@@ -5567,21 +5862,20 @@
}
},
"node-gyp": {
- "version": "3.8.0",
+ "version": "5.0.2",
"bundled": true,
"dev": true,
"requires": {
- "fstream": "^1.0.0",
+ "env-paths": "^1.0.0",
"glob": "^7.0.3",
"graceful-fs": "^4.1.2",
"mkdirp": "^0.5.0",
"nopt": "2 || 3",
"npmlog": "0 || 1 || 2 || 3 || 4",
- "osenv": "0",
"request": "^2.87.0",
"rimraf": "2",
"semver": "~5.3.0",
- "tar": "^2.0.0",
+ "tar": "^4.4.8",
"which": "1"
},
"dependencies": {
@@ -5597,16 +5891,6 @@
"version": "5.3.0",
"bundled": true,
"dev": true
- },
- "tar": {
- "version": "2.2.1",
- "bundled": true,
- "dev": true,
- "requires": {
- "block-stream": "*",
- "fstream": "^1.0.2",
- "inherits": "2"
- }
}
}
},
@@ -5668,13 +5952,13 @@
}
},
"npm-lifecycle": {
- "version": "2.1.0",
+ "version": "3.0.0",
"bundled": true,
"dev": true,
"requires": {
"byline": "^5.0.0",
- "graceful-fs": "^4.1.11",
- "node-gyp": "^3.8.0",
+ "graceful-fs": "^4.1.15",
+ "node-gyp": "^5.0.2",
"resolve-from": "^4.0.0",
"slide": "^1.1.6",
"uid-number": "0.0.6",
@@ -5699,7 +5983,7 @@
}
},
"npm-packlist": {
- "version": "1.4.1",
+ "version": "1.4.4",
"bundled": true,
"dev": true,
"requires": {
@@ -5728,16 +6012,36 @@
}
},
"npm-registry-fetch": {
- "version": "3.9.0",
+ "version": "3.9.1",
"bundled": true,
"dev": true,
"requires": {
"JSONStream": "^1.3.4",
"bluebird": "^3.5.1",
"figgy-pudding": "^3.4.1",
- "lru-cache": "^4.1.3",
- "make-fetch-happen": "^4.0.1",
+ "lru-cache": "^5.1.1",
+ "make-fetch-happen": "^4.0.2",
"npm-package-arg": "^6.1.0"
+ },
+ "dependencies": {
+ "make-fetch-happen": {
+ "version": "4.0.2",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "agentkeepalive": "^3.4.1",
+ "cacache": "^11.3.3",
+ "http-cache-semantics": "^3.8.1",
+ "http-proxy-agent": "^2.1.0",
+ "https-proxy-agent": "^2.2.1",
+ "lru-cache": "^5.1.1",
+ "mississippi": "^3.0.0",
+ "node-fetch-npm": "^2.0.2",
+ "promise-retry": "^1.1.1",
+ "socks-proxy-agent": "^4.0.0",
+ "ssri": "^6.0.0"
+ }
+ }
}
},
"npm-run-path": {
@@ -5779,6 +6083,20 @@
"bundled": true,
"dev": true
},
+ "object-keys": {
+ "version": "1.0.12",
+ "bundled": true,
+ "dev": true
+ },
+ "object.getownpropertydescriptors": {
+ "version": "2.0.3",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "define-properties": "^1.1.2",
+ "es-abstract": "^1.5.1"
+ }
+ },
"once": {
"version": "1.4.0",
"bundled": true,
@@ -5859,7 +6177,7 @@
}
},
"pacote": {
- "version": "9.5.0",
+ "version": "9.5.1",
"bundled": true,
"dev": true,
"requires": {
@@ -5892,14 +6210,6 @@
"which": "^1.3.1"
},
"dependencies": {
- "lru-cache": {
- "version": "5.1.1",
- "bundled": true,
- "dev": true,
- "requires": {
- "yallist": "^3.0.2"
- }
- },
"minipass": {
"version": "2.3.5",
"bundled": true,
@@ -5908,11 +6218,6 @@
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
}
- },
- "yallist": {
- "version": "3.0.3",
- "bundled": true,
- "dev": true
}
}
},
@@ -6098,11 +6403,12 @@
"dev": true
},
"query-string": {
- "version": "6.2.0",
+ "version": "6.8.1",
"bundled": true,
"dev": true,
"requires": {
"decode-uri-component": "^0.2.0",
+ "split-on-first": "^1.0.0",
"strict-uri-encode": "^2.0.0"
}
},
@@ -6172,19 +6478,17 @@
}
},
"read-package-tree": {
- "version": "5.2.2",
+ "version": "5.3.1",
"bundled": true,
"dev": true,
"requires": {
- "debuglog": "^1.0.1",
- "dezalgo": "^1.0.0",
- "once": "^1.3.0",
"read-package-json": "^2.0.0",
- "readdir-scoped-modules": "^1.0.0"
+ "readdir-scoped-modules": "^1.0.0",
+ "util-promisify": "^2.1.0"
}
},
"readable-stream": {
- "version": "3.1.1",
+ "version": "3.4.0",
"bundled": true,
"dev": true,
"requires": {
@@ -6194,7 +6498,7 @@
}
},
"readdir-scoped-modules": {
- "version": "1.0.2",
+ "version": "1.1.0",
"bundled": true,
"dev": true,
"requires": {
@@ -6302,7 +6606,7 @@
"dev": true
},
"semver": {
- "version": "5.6.0",
+ "version": "5.7.0",
"bundled": true,
"dev": true
},
@@ -6320,36 +6624,11 @@
"dev": true
},
"sha": {
- "version": "2.0.1",
+ "version": "3.0.0",
"bundled": true,
"dev": true,
"requires": {
- "graceful-fs": "^4.1.2",
- "readable-stream": "^2.0.2"
- },
- "dependencies": {
- "readable-stream": {
- "version": "2.3.6",
- "bundled": true,
- "dev": true,
- "requires": {
- "core-util-is": "~1.0.0",
- "inherits": "~2.0.3",
- "isarray": "~1.0.0",
- "process-nextick-args": "~2.0.0",
- "safe-buffer": "~5.1.1",
- "string_decoder": "~1.1.1",
- "util-deprecate": "~1.0.1"
- }
- },
- "string_decoder": {
- "version": "1.1.1",
- "bundled": true,
- "dev": true,
- "requires": {
- "safe-buffer": "~5.1.0"
- }
- }
+ "graceful-fs": "^4.1.2"
}
},
"shebang-command": {
@@ -6477,6 +6756,11 @@
"bundled": true,
"dev": true
},
+ "split-on-first": {
+ "version": "1.1.0",
+ "bundled": true,
+ "dev": true
+ },
"sshpk": {
"version": "1.14.2",
"bundled": true,
@@ -6622,24 +6906,19 @@
}
},
"tar": {
- "version": "4.4.8",
+ "version": "4.4.10",
"bundled": true,
"dev": true,
"requires": {
"chownr": "^1.1.1",
"fs-minipass": "^1.2.5",
- "minipass": "^2.3.4",
- "minizlib": "^1.1.1",
+ "minipass": "^2.3.5",
+ "minizlib": "^1.2.1",
"mkdirp": "^0.5.0",
"safe-buffer": "^5.1.2",
- "yallist": "^3.0.2"
+ "yallist": "^3.0.3"
},
"dependencies": {
- "chownr": {
- "version": "1.1.1",
- "bundled": true,
- "dev": true
- },
"minipass": {
"version": "2.3.5",
"bundled": true,
@@ -6824,6 +7103,14 @@
"bundled": true,
"dev": true
},
+ "util-promisify": {
+ "version": "2.1.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "object.getownpropertydescriptors": "^2.0.3"
+ }
+ },
"uuid": {
"version": "3.3.2",
"bundled": true,
@@ -6906,7 +7193,7 @@
}
},
"worker-farm": {
- "version": "1.6.0",
+ "version": "1.7.0",
"bundled": true,
"dev": true,
"requires": {
@@ -6940,7 +7227,7 @@
"dev": true
},
"write-file-atomic": {
- "version": "2.4.2",
+ "version": "2.4.3",
"bundled": true,
"dev": true,
"requires": {
@@ -6965,7 +7252,7 @@
"dev": true
},
"yallist": {
- "version": "2.1.2",
+ "version": "3.0.3",
"bundled": true,
"dev": true
},
@@ -7114,6 +7401,18 @@
}
}
},
+ "object.values": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz",
+ "integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==",
+ "dev": true,
+ "requires": {
+ "define-properties": "^1.1.3",
+ "es-abstract": "^1.12.0",
+ "function-bind": "^1.1.1",
+ "has": "^1.0.3"
+ }
+ },
"once": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -7355,9 +7654,9 @@
"optional": true
},
"prettier": {
- "version": "1.17.1",
- "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.17.1.tgz",
- "integrity": "sha512-TzGRNvuUSmPgwivDqkZ9tM/qTGW9hqDKWOE9YHiyQdixlKbv7kvEqsmDPrcHJTKwthU774TQwZXVtaQ/mMsvjg==",
+ "version": "1.18.2",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.18.2.tgz",
+ "integrity": "sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==",
"dev": true
},
"private": {
@@ -7851,12 +8150,6 @@
"is-finite": "^1.0.0"
}
},
- "requireindex": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
- "integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==",
- "dev": true
- },
"resolve": {
"version": "1.11.0",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz",
@@ -7904,24 +8197,55 @@
}
},
"rollup": {
- "version": "1.12.2",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.12.2.tgz",
- "integrity": "sha512-ePehZfVMIE4eO0/LV6VaMY8kp0D9sbziUabpBeJbHAHa2WJPxuS0lYLmiLamb02e098RIRyq1F2yjM4O08dQVA==",
+ "version": "1.17.0",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.17.0.tgz",
+ "integrity": "sha512-k/j1m0NIsI4SYgCJR4MWPstGJOWfJyd6gycKoMhyoKPVXxm+L49XtbUwZyFsrSU2YXsOkM4u1ll9CS/ZgJBUpw==",
"dev": true,
"requires": {
"@types/estree": "0.0.39",
- "@types/node": "^12.0.2",
- "acorn": "^6.1.1"
+ "@types/node": "^12.6.2",
+ "acorn": "^6.2.0"
+ },
+ "dependencies": {
+ "@types/node": {
+ "version": "12.6.8",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-12.6.8.tgz",
+ "integrity": "sha512-aX+gFgA5GHcDi89KG5keey2zf0WfZk/HAQotEamsK2kbey+8yGKcson0hbK8E+v0NArlCJQCqMP161YhV6ZXLg==",
+ "dev": true
+ },
+ "acorn": {
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.1.tgz",
+ "integrity": "sha512-JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q==",
+ "dev": true
+ }
}
},
"rollup-plugin-babel": {
- "version": "4.3.2",
- "resolved": "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.3.2.tgz",
- "integrity": "sha512-KfnizE258L/4enADKX61ozfwGHoqYauvoofghFJBhFnpH9Sb9dNPpWg8QHOaAfVASUYV8w0mCx430i9z0LJoJg==",
+ "version": "4.3.3",
+ "resolved": "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.3.3.tgz",
+ "integrity": "sha512-tKzWOCmIJD/6aKNz0H1GMM+lW1q9KyFubbWzGiOG540zxPPifnEAHTZwjo0g991Y+DyOZcLqBgqOdqazYE5fkw==",
"dev": true,
"requires": {
"@babel/helper-module-imports": "^7.0.0",
- "rollup-pluginutils": "^2.3.0"
+ "rollup-pluginutils": "^2.8.1"
+ },
+ "dependencies": {
+ "estree-walker": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
+ "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
+ "dev": true
+ },
+ "rollup-pluginutils": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.1.tgz",
+ "integrity": "sha512-J5oAoysWar6GuZo0s+3bZ6sVZAC0pfqKz68De7ZgDi5z63jOVZn1uJL/+z1jeKHNbGII8kAyHF5q8LnxSX5lQg==",
+ "dev": true,
+ "requires": {
+ "estree-walker": "^0.6.1"
+ }
+ }
}
},
"rollup-plugin-json": {
@@ -8632,9 +8956,9 @@
"dev": true
},
"set-value": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
- "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+ "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
"dev": true,
"requires": {
"extend-shallow": "^2.0.1",
@@ -8903,9 +9227,9 @@
}
},
"spdx-license-ids": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz",
- "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==",
+ "version": "3.0.5",
+ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+ "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
"dev": true
},
"split-string": {
@@ -9192,9 +9516,9 @@
"dev": true
},
"tsutils": {
- "version": "3.10.0",
- "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.10.0.tgz",
- "integrity": "sha512-q20XSMq7jutbGB8luhKKsQldRKWvyBO2BGqni3p4yq8Ys9bEP/xQw3KepKmMRt9gJ4lvQSScrihJrcKdKoSU7Q==",
+ "version": "3.14.0",
+ "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.14.0.tgz",
+ "integrity": "sha512-SmzGbB0l+8I0QwsPgjooFRaRvHLBLNYM8SeQ0k6rtNDru5sCGeLJcZdwilNndN+GysuFjF5EIYgN8GfFG6UeUw==",
"dev": true,
"requires": {
"tslib": "^1.8.1"
@@ -9216,9 +9540,9 @@
"dev": true
},
"typescript": {
- "version": "3.4.5",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.5.tgz",
- "integrity": "sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==",
+ "version": "3.5.3",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz",
+ "integrity": "sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==",
"dev": true
},
"typescript-styled-plugin": {
@@ -9252,38 +9576,15 @@
"dev": true
},
"union-value": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
- "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+ "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
"dev": true,
"requires": {
"arr-union": "^3.1.0",
"get-value": "^2.0.6",
"is-extendable": "^0.1.1",
- "set-value": "^0.4.3"
- },
- "dependencies": {
- "extend-shallow": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "dev": true,
- "requires": {
- "is-extendable": "^0.1.0"
- }
- },
- "set-value": {
- "version": "0.4.3",
- "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
- "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
- "dev": true,
- "requires": {
- "extend-shallow": "^2.0.1",
- "is-extendable": "^0.1.1",
- "is-plain-object": "^2.0.1",
- "to-object-path": "^0.3.0"
- }
- }
+ "set-value": "^2.0.1"
}
},
"universalify": {
diff --git a/package.json b/package.json
index 405d5bd..e01719c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "button-card",
- "version": "1.11.1",
+ "version": "2.0.0",
"description": "Button card for lovelace",
"main": "dist/button-card.js",
"pre-commit": [
@@ -32,33 +32,33 @@
},
"homepage": "https://github.com/custom-cards/button-card#readme",
"devDependencies": {
- "@babel/core": "^7.4.4",
- "@babel/plugin-proposal-class-properties": "^7.4.4",
+ "@babel/core": "^7.5.5",
+ "@babel/plugin-proposal-class-properties": "^7.5.5",
"@babel/plugin-proposal-decorators": "^7.4.4",
- "@typescript-eslint/eslint-plugin": "^1.9.0",
- "@typescript-eslint/parser": "^1.9.0",
+ "@typescript-eslint/eslint-plugin": "^1.12.0",
+ "@typescript-eslint/parser": "^1.12.0",
"babel-cli": "^6.26.0",
"eslint": "^5.16.0",
- "eslint-config-airbnb-base": "^13.1.0",
- "eslint-plugin-import": "^2.17.2",
- "npm": "^6.9.0",
+ "eslint-config-airbnb-base": "^13.2.0",
+ "eslint-plugin-import": "^2.18.2",
+ "npm": "^6.10.1",
"pre-commit": "^1.2.2",
- "prettier": "^1.17.1",
- "rollup": "^1.12.2",
- "rollup-plugin-babel": "^4.3.2",
+ "prettier": "^1.18.2",
+ "rollup": "^1.17.0",
+ "rollup-plugin-babel": "^4.3.3",
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-node-resolve": "^4.2.4",
"rollup-plugin-terser": "^4.0.4",
"rollup-plugin-typescript2": "^0.20.1",
"ts-lit-plugin": "^1.0.6",
- "typescript": "^3.4.4",
+ "typescript": "^3.5.3",
"typescript-styled-plugin": "^0.14.0"
},
"dependencies": {
- "@ctrl/tinycolor": "^2.4.0",
- "custom-card-helpers": "github:custom-cards/custom-card-helpers#fix-service-call",
+ "@ctrl/tinycolor": "^2.5.3",
+ "custom-card-helpers": "^1.2.2",
"home-assistant-js-websocket": "^3.4.0",
- "lit-element": "^2.1.0",
- "lit-html": "^1.0.0"
+ "lit-element": "^2.2.0",
+ "lit-html": "^1.1.1"
}
}
diff --git a/src/button-card.ts b/src/button-card.ts
index fbc9453..3845049 100644
--- a/src/button-card.ts
+++ b/src/button-card.ts
@@ -10,14 +10,10 @@ import {
import { styleMap, StyleInfo } from 'lit-html/directives/style-map';
import { unsafeHTML } from 'lit-html/directives/unsafe-html';
import { ifDefined } from 'lit-html/directives/if-defined';
-import { classMap, ClassInfo } from 'lit-html/directives/class-map.js';
+import { classMap, ClassInfo } from 'lit-html/directives/class-map';
import {
HassEntity,
} from 'home-assistant-js-websocket';
-import {
- ButtonCardConfig,
- StateConfig,
-} from './types';
import {
domainIcon,
HomeAssistant,
@@ -25,10 +21,14 @@ import {
getLovelace,
timerTimeRemaining,
secondsToDuration,
- durationToSeconds
+ durationToSeconds,
// Still not working...
// longPress,
} from 'custom-card-helpers';
+import {
+ ButtonCardConfig,
+ StateConfig,
+} from './types';
import { longPress } from './long-press';
import {
computeDomain,
@@ -52,6 +52,8 @@ class ButtonCard extends LitElement {
@property() private _timeRemaining?: number;
+ @property() private _hasTemplate?: boolean;
+
private _interval?: number;
public disconnectedCallback(): void {
@@ -62,9 +64,9 @@ class ButtonCard extends LitElement {
public connectedCallback(): void {
super.connectedCallback();
if (
- this.config &&
- this.config.entity &&
- computeDomain(this.config.entity) === 'timer'
+ this.config
+ && this.config.entity
+ && computeDomain(this.config.entity) === 'timer'
) {
const stateObj = this.hass!.states[this.config.entity];
this._startInterval(stateObj);
@@ -85,16 +87,7 @@ class ButtonCard extends LitElement {
protected shouldUpdate(changedProps: PropertyValues): boolean {
const state = this.config!.entity ? this.hass!.states[this.config!.entity] : undefined;
const configState = this._getMatchingConfigState(state);
- const forceUpdate = (
- configState && (
- this.config!.show_label && configState.label_template
- || this.config!.show_entity_picture && configState.entity_picture_template
- || this.config!.show_name && configState.name_template
- )
- || this.config!.show_label && this.config!.label_template
- || this.config!.show_name && this.config!.name_template
- || this.config!.show_entity_picture && this.config!.entity_picture_template
- )
+ const forceUpdate = this._hasTemplate
|| this.config!.state
&& this.config!.state.find(elt => elt.operator === 'template')
|| changedProps.has('_timeRemaining')
@@ -106,10 +99,10 @@ class ButtonCard extends LitElement {
super.updated(changedProps);
if (
- this.config &&
- this.config.entity &&
- computeDomain(this.config.entity) === 'timer' &&
- changedProps.has('hass')
+ this.config
+ && this.config.entity
+ && computeDomain(this.config.entity) === 'timer'
+ && changedProps.has('hass')
) {
const stateObj = this.hass!.states[this.config.entity];
const oldHass = changedProps.get('hass') as this['hass'];
@@ -139,7 +132,7 @@ class ButtonCard extends LitElement {
if (stateObj.state === 'active') {
this._interval = window.setInterval(
() => this._calculateRemaining(stateObj),
- 1000
+ 1000,
);
}
}
@@ -154,7 +147,7 @@ class ButtonCard extends LitElement {
}
return secondsToDuration(
- this._timeRemaining || durationToSeconds(stateObj.attributes['duration'])
+ this._timeRemaining || durationToSeconds(stateObj.attributes.duration),
);
}
@@ -174,24 +167,25 @@ class ButtonCard extends LitElement {
switch (elt.operator) {
case '==':
/* eslint eqeqeq: 0 */
- return (state && state.state == elt.value);
+ return (state && state.state == this._getTemplateOrString(state, elt.value));
case '<=':
- return (state && state.state <= elt.value);
+ return (state && state.state <= this._getTemplateOrString(state, elt.value));
case '<':
- return (state && state.state < elt.value);
+ return (state && state.state < this._getTemplateOrString(state, elt.value));
case '>=':
- return (state && state.state >= elt.value);
+ return (state && state.state >= this._getTemplateOrString(state, elt.value));
case '>':
- return (state && state.state > elt.value);
+ return (state && state.state > this._getTemplateOrString(state, elt.value));
case '!=':
- return (state && state.state != elt.value);
+ return (state && state.state != this._getTemplateOrString(state, elt.value));
case 'regex': {
/* eslint no-unneeded-ternary: 0 */
- const matches = state && state.state.match(elt.value) ? true : false;
+ const matches = state
+ && state.state.match(this._getTemplateOrString(state, elt.value)) ? true : false;
return matches;
}
case 'template': {
- return this._evalTemplate(state, elt.value);
+ return this._getTemplateOrString(state, elt.value);
}
case 'default':
def = elt;
@@ -200,7 +194,7 @@ class ButtonCard extends LitElement {
return false;
}
} else {
- return state && (elt.value == state.state);
+ return state && (this._getTemplateOrString(state, elt.value) == state.state);
}
});
if (!retval && def) {
@@ -210,11 +204,29 @@ class ButtonCard extends LitElement {
}
private _evalTemplate(state: HassEntity | undefined, func: any): any {
+ /* eslint no-new-func: 0 */
return new Function('states', 'entity', 'user', 'hass',
`'use strict'; ${func}`)
.call(this, this.hass!.states, state, this.hass!.user, this.hass);
}
+ private _getTemplateOrString(
+ state: HassEntity | undefined,
+ value: any | undefined,
+ ): any | undefined {
+ if (!value) return undefined;
+ if (typeof value === 'number') return value;
+ const trimmed = value.trim();
+ if (
+ trimmed.substring(0, 3) === '[[['
+ && trimmed.slice(-3) === ']]]'
+ ) {
+ return this._evalTemplate(state, trimmed.slice(3, -3));
+ } else {
+ return value;
+ }
+ }
+
private _getDefaultColorForState(state: HassEntity): string {
switch (state.state) {
case 'on':
@@ -300,7 +312,7 @@ class ButtonCard extends LitElement {
? state.attributes.icon
: domainIcon(computeDomain(state.entity_id), state.state);
}
- return icon;
+ return this._getTemplateOrString(state, icon);
}
private _buildEntityPicture(
@@ -311,33 +323,24 @@ class ButtonCard extends LitElement {
return undefined;
}
let entityPicture: string | undefined;
- let matchingEntityPictureTemplate: string | undefined;
- if (configState && configState.entity_picture_template) {
- matchingEntityPictureTemplate = configState.entity_picture_template;
- } else {
- matchingEntityPictureTemplate = this.config!.entity_picture_template;
- }
- if (!matchingEntityPictureTemplate) {
- if (configState && configState.entity_picture) {
- entityPicture = configState.entity_picture;
- } else if (this.config!.entity_picture) {
- entityPicture = this.config!.entity_picture;
- } else if (state) {
- entityPicture = state.attributes && state.attributes.entity_picture
- ? state.attributes.entity_picture : undefined;
- }
- return entityPicture;
+ if (configState && configState.entity_picture) {
+ entityPicture = configState.entity_picture;
+ } else if (this.config!.entity_picture) {
+ entityPicture = this.config!.entity_picture;
+ } else if (state) {
+ entityPicture = state.attributes && state.attributes.entity_picture
+ ? state.attributes.entity_picture : undefined;
}
-
- return this._evalTemplate(state, matchingEntityPictureTemplate);
+ return this._getTemplateOrString(state, entityPicture);
}
private _buildStyleGeneric(
+ state: HassEntity | undefined,
configState: StateConfig | undefined,
styleType: string,
): StyleInfo {
- let style: StyleInfo = {};
+ let style: any = {};
if (this.config!.styles && this.config!.styles[styleType]) {
style = Object.assign(style, ...this.config!.styles[styleType]);
}
@@ -349,6 +352,41 @@ class ButtonCard extends LitElement {
...configStateStyle,
};
}
+ Object.keys(style).forEach((key) => {
+ style[key] = this._getTemplateOrString(state, style[key]);
+ });
+ return style;
+ }
+
+ private _buildCustomStyleGeneric(
+ state: HassEntity | undefined,
+ configState: StateConfig | undefined,
+ styleType: string,
+ ): StyleInfo {
+ let style: any = {};
+ if (this.config!.styles
+ && this.config!.styles.custom_fields
+ && this.config!.styles.custom_fields[styleType]
+ ) {
+ style = Object.assign(style, ...this.config!.styles.custom_fields[styleType]);
+ }
+ if (configState && configState.styles
+ && configState.styles.custom_fields
+ && configState.styles.custom_fields[styleType]
+ ) {
+ let configStateStyle: StyleInfo = {};
+ configStateStyle = Object.assign(
+ configStateStyle,
+ ...configState.styles.custom_fields[styleType],
+ );
+ style = {
+ ...style,
+ ...configStateStyle,
+ };
+ }
+ Object.keys(style).forEach((key) => {
+ style[key] = this._getTemplateOrString(state, style[key]);
+ });
return style;
}
@@ -359,26 +397,17 @@ class ButtonCard extends LitElement {
return undefined;
}
let name: string | undefined;
- let matchingNameTemplate: string | undefined;
- if (configState && configState.name_template) {
- matchingNameTemplate = configState.name_template;
- } else {
- matchingNameTemplate = this.config!.name_template;
- }
- if (!matchingNameTemplate) {
- if (configState && configState.name) {
- name = configState.name;
- } else if (this.config!.name) {
- name = this.config!.name;
- } else if (state) {
- name = state.attributes && state.attributes.friendly_name
- ? state.attributes.friendly_name : computeEntity(state.entity_id);
- }
- return name;
+ if (configState && configState.name) {
+ name = configState.name;
+ } else if (this.config!.name) {
+ name = this.config!.name;
+ } else if (state) {
+ name = state.attributes && state.attributes.friendly_name
+ ? state.attributes.friendly_name : computeEntity(state.entity_id);
}
- return this._evalTemplate(state, matchingNameTemplate);
+ return this._getTemplateOrString(state, name);
}
private _buildStateString(state: HassEntity | undefined): string | undefined {
@@ -394,7 +423,7 @@ class ButtonCard extends LitElement {
} else {
stateString = this._computeTimeDisplay(state);
if (state.state === 'paused') {
- stateString += ` (${localizedState})`
+ stateString += ` (${localizedState})`;
}
}
} else {
@@ -422,8 +451,8 @@ class ButtonCard extends LitElement {
state: HassEntity | undefined,
style: StyleInfo,
): TemplateResult | undefined {
- return this.config!.show_last_changed && state ?
- html`
+ return this.config!.show_last_changed && state
+ ? html`
${unsafeHTML(fields[key])}
`;
+ }
+ });
+ return result;
}
private _isClickable(state: HassEntity | undefined): boolean {
@@ -525,15 +576,15 @@ class ButtonCard extends LitElement {
const configState = this._getMatchingConfigState(state);
const color = this._buildCssColorAttribute(state, configState);
let buttonColor = color;
- let cardStyle: StyleInfo = {};
- let lockStyle: StyleInfo = {};
- let aspectRatio: StyleInfo = {};
- const lockStyleFromConfig = this._buildStyleGeneric(configState, 'lock');
- const configCardStyle = this._buildStyleGeneric(configState, 'card');
+ let cardStyle: any = {};
+ let lockStyle: any = {};
+ const aspectRatio: any = {};
+ const lockStyleFromConfig = this._buildStyleGeneric(state, configState, 'lock');
+ const configCardStyle = this._buildStyleGeneric(state, configState, 'card');
const classList: ClassInfo = {
'button-card-main': true,
disabled: !this._isClickable(state),
- }
+ };
if (configCardStyle.width) {
this.style.setProperty('flex', '0 0 auto');
this.style.setProperty('max-width', 'fit-content');
@@ -629,11 +680,11 @@ class ButtonCard extends LitElement {
const iconTemplate = this._getIconHtml(state, configState, color);
const itemClass: string[] = [containerClass];
const label = this._buildLabel(state, configState);
- const nameStyleFromConfig = this._buildStyleGeneric(configState, 'name');
- const stateStyleFromConfig = this._buildStyleGeneric(configState, 'state');
- const labelStyleFromConfig = this._buildStyleGeneric(configState, 'label');
+ const nameStyleFromConfig = this._buildStyleGeneric(state, configState, 'name');
+ const stateStyleFromConfig = this._buildStyleGeneric(state, configState, 'state');
+ const labelStyleFromConfig = this._buildStyleGeneric(state, configState, 'label');
const lastChangedTemplate = this._buildLastChanged(state, labelStyleFromConfig);
- const gridStyleFromConfig = this._buildStyleGeneric(configState, 'grid');
+ const gridStyleFromConfig = this._buildStyleGeneric(state, configState, 'grid');
if (!iconTemplate) itemClass.push('no-icon');
if (!name) itemClass.push('no-name');
if (!stateString) itemClass.push('no-state');
@@ -646,6 +697,7 @@ class ButtonCard extends LitElement {
${stateString ? html`${stateString}
` : ''}
${label && !lastChangedTemplate ? html`${unsafeHTML(label)}
` : ''}
${lastChangedTemplate ? lastChangedTemplate : ''}
+ ${this._buildCustomFields(state, configState)}