@fatehan/tsrp 1.0.32 → 1.0.34
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/system.io.d.ts.map +1 -1
- package/dist/system.io.js +17 -5
- package/package.json +1 -1
package/dist/index.d.ts
CHANGED
|
@@ -18,7 +18,7 @@ export declare class ReportService {
|
|
|
18
18
|
CommandHistoryReport(request: CommandHistoryRequest): Promise<CommandHistoryResponse>;
|
|
19
19
|
ChartReport(request: ChartRequest, responses: (chunk: ChartResponse) => void): Promise<void>;
|
|
20
20
|
SystemIoReport(request: SystemIoRequest): Promise<SystemIoResponse>;
|
|
21
|
-
SystemIoCast(systemIo: SystemIo[], deviceIo: DeviceIo[], data: Data): Promise<ShownIo[]>;
|
|
21
|
+
SystemIoCast(systemIo: SystemIo[] | null, deviceIo: DeviceIo[], data: Data): Promise<ShownIo[]>;
|
|
22
22
|
Matin(): Promise<void>;
|
|
23
23
|
}
|
|
24
24
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,yBAAyB,EACzB,YAAY,EACZ,aAAa,EACb,qBAAqB,EACrB,sBAAsB,EACtB,0BAA0B,EAC1B,2BAA2B,EAC3B,iBAAiB,EACjB,kBAAkB,EAClB,UAAU,EACV,WAAW,EACX,kBAAkB,EAClB,mBAAmB,EACnB,gBAAgB,EAChB,iBAAiB,EACjB,eAAe,EACf,gBAAgB,EAChB,sBAAsB,EACtB,uBAAuB,EACvB,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,yBAAyB,EACzB,YAAY,EACZ,aAAa,EACb,qBAAqB,EACrB,sBAAsB,EACtB,0BAA0B,EAC1B,2BAA2B,EAC3B,iBAAiB,EACjB,kBAAkB,EAClB,UAAU,EACV,WAAW,EACX,kBAAkB,EAClB,mBAAmB,EACnB,gBAAgB,EAChB,iBAAiB,EACjB,eAAe,EACf,gBAAgB,EAChB,sBAAsB,EACtB,uBAAuB,EACvB,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAGnD,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA+C;IACzE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAc;gBAE1B,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM;IAcjE,eAAe,CACpB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,iBAAiB,CAAC;IAyBtB,qBAAqB,CAC1B,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,uBAAuB,CAAC;IAyB5B,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAyBnE,iBAAiB,CACtB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,mBAAmB,CAAC;IAyBxB,mBAAmB,CACxB,OAAO,EAAE,0BAA0B,GAClC,OAAO,CAAC,2BAA2B,CAAC;IAyBhC,SAAS,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC;IAuBpD,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAyBnE,uBAAuB,CAC5B,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,yBAAyB,CAAC;IAwB9B,eAAe,CACpB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,iBAAiB,CAAC;IAwBtB,oBAAoB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAmB/E,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI;IAiClF,cAAc,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA6B7D,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAgB/F,KAAK;CAGnB"}
|
package/dist/system.io.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system.io.d.ts","sourceRoot":"","sources":["../src/system.io.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"system.io.d.ts","sourceRoot":"","sources":["../src/system.io.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,OAAO,EACP,QAAQ,EAET,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAEnD,QAAA,MAAM,YAAY,GAChB,UAAU,QAAQ,EAAE,EACpB,UAAU,QAAQ,EAAE,EACpB,MAAM,IAAI,KACT,OAAO,EAsDT,CAAC;AAuBF,eAAe,YAAY,CAAC"}
|
package/dist/system.io.js
CHANGED
|
@@ -1,9 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const models_1 = require("./fatehan/models/models");
|
|
3
4
|
const SystemIoCast = (systemIo, deviceIo, data) => {
|
|
4
5
|
let list = [];
|
|
5
6
|
for (let i = 0; i < systemIo.length; i++) {
|
|
6
7
|
const value = getNestedPropertyValue(data, systemIo[i].key);
|
|
8
|
+
let style = systemIo[i].activeStyle;
|
|
9
|
+
if (systemIo[i].type === models_1.SystemIoType.BOOLEAN) {
|
|
10
|
+
style =
|
|
11
|
+
value === "false" ? systemIo[i].inactiveStyle : systemIo[i].activeStyle;
|
|
12
|
+
}
|
|
7
13
|
if (value != null) {
|
|
8
14
|
list.push({
|
|
9
15
|
value: value,
|
|
@@ -24,16 +30,22 @@ const SystemIoCast = (systemIo, deviceIo, data) => {
|
|
|
24
30
|
hasIos = false;
|
|
25
31
|
break;
|
|
26
32
|
}
|
|
27
|
-
formula = formula.replace(new RegExp("\\$" + items[i],
|
|
33
|
+
formula = formula.replace(new RegExp("\\$" + items[i], "g"), value);
|
|
28
34
|
}
|
|
29
35
|
if (!hasIos) {
|
|
30
36
|
continue;
|
|
31
37
|
}
|
|
38
|
+
const value = eval(formula);
|
|
39
|
+
let style = deviceIo[i].activeStyle;
|
|
40
|
+
if (deviceIo[i].type === models_1.SystemIoType.BOOLEAN) {
|
|
41
|
+
style =
|
|
42
|
+
value === "false" ? deviceIo[i].inactiveStyle : deviceIo[i].activeStyle;
|
|
43
|
+
}
|
|
32
44
|
list.push({
|
|
33
|
-
value:
|
|
45
|
+
value: value,
|
|
34
46
|
name: deviceIo[i].name,
|
|
35
47
|
unit: deviceIo[i].unit,
|
|
36
|
-
style:
|
|
48
|
+
style: style,
|
|
37
49
|
description: deviceIo[i].description,
|
|
38
50
|
});
|
|
39
51
|
}
|
|
@@ -43,10 +55,10 @@ function extractVariables(str) {
|
|
|
43
55
|
const matches = str.match(/\$(\w+(?:\.\w+)*)/g);
|
|
44
56
|
if (!matches)
|
|
45
57
|
return [];
|
|
46
|
-
return matches.map(match => match.substring(1));
|
|
58
|
+
return matches.map((match) => match.substring(1));
|
|
47
59
|
}
|
|
48
60
|
function getNestedPropertyValue(obj, propertyPath) {
|
|
49
|
-
const properties = propertyPath.split(
|
|
61
|
+
const properties = propertyPath.split(".");
|
|
50
62
|
let currentObj = obj;
|
|
51
63
|
for (const property of properties) {
|
|
52
64
|
if (!Object.prototype.hasOwnProperty.call(currentObj, property)) {
|