Skip to content

Commit

Permalink
fix: TS refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
Koenkk committed Jun 6, 2023
1 parent 2f5a7dd commit 4e96286
Show file tree
Hide file tree
Showing 145 changed files with 678 additions and 611 deletions.
2 changes: 1 addition & 1 deletion src/devices/ITCommander.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import fz from '../converters/fromZigbee';
import * as exposes from '../lib/exposes';
const e = exposes.presets;
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';

const definitions: Definition[] = [
{
Expand Down
2 changes: 1 addition & 1 deletion src/devices/acova.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import tz from '../converters/toZigbee';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
const e = exposes.presets;

const definitions: Definition[] = [
Expand Down
2 changes: 1 addition & 1 deletion src/devices/adeo.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
import extend from '../lib/extend';
import tz from '../converters/toZigbee';
const e = exposes.presets;
Expand Down
2 changes: 1 addition & 1 deletion src/devices/adurosmart.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import tz from '../converters/toZigbee';
import * as legacy from '../lib/legacy';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
import extend from '../lib/extend';
const e = exposes.presets;

Expand Down
4 changes: 2 additions & 2 deletions src/devices/airam.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import * as legacy from '../lib/legacy';
import constants from '../lib/constants';
import reporting from '../lib/reporting';
import * as constants from '../lib/constants';
import * as reporting from '../lib/reporting';
import extend from '../lib/extend';
const e = exposes.presets;

Expand Down
2 changes: 1 addition & 1 deletion src/devices/akuvox.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
const e = exposes.presets;

const definitions: Definition[] = [
Expand Down
2 changes: 1 addition & 1 deletion src/devices/anchor.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
import extend from '../lib/extend';

const definitions: Definition[] = [
Expand Down
2 changes: 1 addition & 1 deletion src/devices/atlantic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {assertString} from '../lib/utils2';
import fz from '../converters/fromZigbee';
import tz from '../converters/toZigbee';
import * as exposes from '../lib/exposes';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
import utils from '../lib/utils';
import assert from 'assert';
const e = exposes.presets;
Expand Down
2 changes: 1 addition & 1 deletion src/devices/atsmart.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as exposes from '../lib/exposes';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
import extend from '../lib/extend';
const e = exposes.presets;

Expand Down
2 changes: 1 addition & 1 deletion src/devices/aubess.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import zosung from '../lib/zosung';
import * as zosung from '../lib/zosung';
const fzZosung = zosung.fzZosung;
const tzZosung = zosung.tzZosung;
const ez = zosung.presetsZosung;
Expand Down
2 changes: 1 addition & 1 deletion src/devices/aurora_lighting.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import tz from '../converters/toZigbee';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
import extend from '../lib/extend';
const e = exposes.presets;
import utils from '../lib/utils';
Expand Down
2 changes: 1 addition & 1 deletion src/devices/automaton.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
import * as tuya from '../lib/tuya';

const definitions: Definition[] = [
Expand Down
2 changes: 1 addition & 1 deletion src/devices/axis.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import tz from '../converters/toZigbee';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
const e = exposes.presets;
const definitions: Definition[] = [
{
Expand Down
2 changes: 1 addition & 1 deletion src/devices/bitron.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import * as legacy from '../lib/legacy';
import tz from '../converters/toZigbee';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
import extend from '../lib/extend';
const e = exposes.presets;
const ea = exposes.access;
Expand Down
2 changes: 1 addition & 1 deletion src/devices/blaupunkt.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import tz from '../converters/toZigbee';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
const e = exposes.presets;
const ea = exposes.access;

Expand Down
2 changes: 1 addition & 1 deletion src/devices/blitzwolf.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as exposes from '../lib/exposes';
import * as legacy from '../lib/legacy';
import tz from '../converters/toZigbee';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
import extend from '../lib/extend';
const e = exposes.presets;

Expand Down
6 changes: 4 additions & 2 deletions src/devices/bosch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import herdsman from 'zigbee-herdsman';
import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import tz from '../converters/toZigbee';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
import utils from '../lib/utils';
import constants from '../lib/constants';
import * as constants from '../lib/constants';
import ota from '../lib/ota';
import {assertEndpoint, assertNumber, assertString, getFromLookup} from '../lib/utils2';
const e = exposes.presets;
Expand Down Expand Up @@ -819,6 +819,7 @@ const definitions: Definition[] = [
await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
await reporting.bind(endpoint, coordinatorEndpoint, ['seMetering']);
await reporting.readMeteringMultiplierDivisor(endpoint);
// @ts-expect-error
await reporting.currentSummDelivered(endpoint, {change: [0, 1]});
await reporting.bind(endpoint, coordinatorEndpoint, ['haElectricalMeasurement']);
await endpoint.read('haElectricalMeasurement', ['acPowerMultiplier', 'acPowerDivisor']);
Expand Down Expand Up @@ -848,6 +849,7 @@ const definitions: Definition[] = [
await reporting.bind(endpoint, coordinatorEndpoint, ['genOnOff']);
await reporting.bind(endpoint, coordinatorEndpoint, ['seMetering']);
await reporting.readMeteringMultiplierDivisor(endpoint);
// @ts-expect-error
await reporting.currentSummDelivered(endpoint, {change: [0, 1]});
await reporting.bind(endpoint, coordinatorEndpoint, ['haElectricalMeasurement']);
await endpoint.read('haElectricalMeasurement', ['acPowerMultiplier', 'acPowerDivisor']);
Expand Down
2 changes: 1 addition & 1 deletion src/devices/bouffalo_lab.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
import extend from '../lib/extend';

const definitions: Definition[] = [
Expand Down
2 changes: 1 addition & 1 deletion src/devices/bticino.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import tz from '../converters/toZigbee';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
import extend from '../lib/extend';
const e = exposes.presets;
const ea = exposes.access;
Expand Down
4 changes: 2 additions & 2 deletions src/devices/busch-jaeger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import * as legacy from '../lib/legacy';
import tz from '../converters/toZigbee';
import globalStore from '../lib/store';
import reporting from '../lib/reporting';
import * as globalStore from '../lib/store';
import * as reporting from '../lib/reporting';
import extend from '../lib/extend';
const e = exposes.presets;

Expand Down
2 changes: 1 addition & 1 deletion src/devices/candeo.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
import extend from '../lib/extend';
const e = exposes.presets;

Expand Down
2 changes: 1 addition & 1 deletion src/devices/casaia.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
const e = exposes.presets;
import tz from '../converters/toZigbee';
import extend from '../lib/extend';
Expand Down
6 changes: 3 additions & 3 deletions src/devices/centralite.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import tz from '../converters/toZigbee';
import globalStore from '../lib/store';
import reporting from '../lib/reporting';
import * as globalStore from '../lib/store';
import * as reporting from '../lib/reporting';
import extend from '../lib/extend';
const e = exposes.presets;
const ea = exposes.access;
import constants from '../lib/constants';
import * as constants from '../lib/constants';

const fzLocal = {
thermostat_3156105: {
Expand Down
2 changes: 1 addition & 1 deletion src/devices/cleode.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as exposes from '../lib/exposes';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
const e = exposes.presets;
import extend from '../lib/extend';

Expand Down
2 changes: 1 addition & 1 deletion src/devices/cleverio.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import tz from '../converters/toZigbee';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
import * as tuya from '../lib/tuya';
const e = exposes.presets;
const ea = exposes.access;
Expand Down
2 changes: 1 addition & 1 deletion src/devices/climax.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import tz from '../converters/toZigbee';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
import extend from '../lib/extend';
const e = exposes.presets;
const ea = exposes.access;
Expand Down
2 changes: 1 addition & 1 deletion src/devices/current_products_corp.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import fz from '../converters/fromZigbee';
import tz from '../converters/toZigbee';
import * as exposes from '../lib/exposes';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
const e = exposes.presets;

const definitions: Definition[] = [
Expand Down
2 changes: 1 addition & 1 deletion src/devices/danalock.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import tz from '../converters/toZigbee';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
import ota from '../lib/ota';
const e = exposes.presets;

Expand Down
4 changes: 2 additions & 2 deletions src/devices/danfoss.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import tz from '../converters/toZigbee';
import ota from '../lib/ota';
import constants from '../lib/constants';
import reporting from '../lib/reporting';
import * as constants from '../lib/constants';
import * as reporting from '../lib/reporting';
const e = exposes.presets;
const ea = exposes.access;

Expand Down
4 changes: 2 additions & 2 deletions src/devices/diyruz.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import * as legacy from '../lib/legacy';
import tz from '../converters/toZigbee';
import constants from '../lib/constants';
import reporting from '../lib/reporting';
import * as constants from '../lib/constants';
import * as reporting from '../lib/reporting';
import extend from '../lib/extend';
const e = exposes.presets;
const ea = exposes.access;
Expand Down
2 changes: 1 addition & 1 deletion src/devices/easyaccess.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import tz from '../converters/toZigbee';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
const e = exposes.presets;
const ea = exposes.access;

Expand Down
2 changes: 1 addition & 1 deletion src/devices/ecodim.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
const e = exposes.presets;
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
import extend from '../lib/extend';
import ota from '../lib/ota';
import * as tuya from '../lib/tuya';
Expand Down
2 changes: 1 addition & 1 deletion src/devices/ecolink.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
const e = exposes.presets;

const definitions: Definition[] = [
Expand Down
2 changes: 1 addition & 1 deletion src/devices/ecozy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import * as legacy from '../lib/legacy';
import tz from '../converters/toZigbee';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
const e = exposes.presets;
const ea = exposes.access;

Expand Down
2 changes: 1 addition & 1 deletion src/devices/edp.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import tz from '../converters/toZigbee';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
import extend from '../lib/extend';
const e = exposes.presets;

Expand Down
4 changes: 2 additions & 2 deletions src/devices/elko.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import tz from '../converters/toZigbee';
import constants from '../lib/constants';
import reporting from '../lib/reporting';
import * as constants from '../lib/constants';
import * as reporting from '../lib/reporting';
import extend from '../lib/extend';
const ea = exposes.access;
const e = exposes.presets;
Expand Down
2 changes: 1 addition & 1 deletion src/devices/enbrighten.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import fz from '../converters/fromZigbee';
import * as exposes from '../lib/exposes';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
import extend from '../lib/extend';
const e = exposes.presets;

Expand Down
2 changes: 1 addition & 1 deletion src/devices/envilar.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
import extend from '../lib/extend';
import * as exposes from '../lib/exposes';
const e = exposes.presets;
Expand Down
2 changes: 1 addition & 1 deletion src/devices/essentialb.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as exposes from '../lib/exposes';
import fz from '../converters/fromZigbee';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
import extend from '../lib/extend';
const e = exposes.presets;

Expand Down
4 changes: 2 additions & 2 deletions src/devices/eurotronic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import fz from '../converters/fromZigbee';
import * as legacy from '../lib/legacy';
import tz from '../converters/toZigbee';
import ota from '../lib/ota';
import constants from '../lib/constants';
import reporting from '../lib/reporting';
import * as constants from '../lib/constants';
import * as reporting from '../lib/reporting';
const e = exposes.presets;

const definitions: Definition[] = [
Expand Down
2 changes: 1 addition & 1 deletion src/devices/evanell.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as exposes from '../lib/exposes';
import * as legacy from '../lib/legacy';
import * as tuya from '../lib/tuya';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
const e = exposes.presets;
const ea = exposes.access;

Expand Down
2 changes: 1 addition & 1 deletion src/devices/evology.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import fz from '../converters/fromZigbee';
import tz from '../converters/toZigbee';
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
import * as exposes from '../lib/exposes';
const e = exposes.presets;

Expand Down
2 changes: 1 addition & 1 deletion src/devices/evvr.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import reporting from '../lib/reporting';
import * as reporting from '../lib/reporting';
import extend from '../lib/extend';

const definitions: Definition[] = [
Expand Down
Loading

0 comments on commit 4e96286

Please sign in to comment.