@yamcs/opi 1.3.4 → 1.3.6
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/opi.js +8 -8
- package/dist/opi.js.map +3 -3
- package/dist/types/Display.d.ts +1 -1
- package/dist/types/Widget.d.ts +1 -1
- package/dist/types/index.d.ts +2 -1
- package/dist/types/pv/PV.d.ts +3 -0
- package/dist/types/pv/PVProvider.d.ts +1 -1
- package/dist/types/pv/Sample.d.ts +6 -0
- package/dist/types/pv/SystemPVProvider.d.ts +1 -1
- package/dist/types/pv/TypeHint.d.ts +5 -0
- package/dist/types/pv/sim.d.ts +1 -1
- package/dist/types/scripting/PVUtil.d.ts +1 -1
- package/dist/types/utils.d.ts +2 -1
- package/dist/types/widgets/monitors/LED.d.ts +1 -1
- package/dist/types/widgets/others/Connection.d.ts +1 -1
- package/dist/types/widgets/others/DisplayWidget.d.ts +1 -1
- package/dist/types/widgets/others/GroupingContainer.d.ts +1 -1
- package/dist/types/widgets/others/LinkingContainer.d.ts +2 -2
- package/dist/types/widgets/others/TabbedContainer.d.ts +1 -1
- package/package.json +5 -2
package/dist/types/Display.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { Color } from "./Color";
|
|
|
2
2
|
import { ConsoleHandler } from "./ConsoleHandler";
|
|
3
3
|
import { DialogHandler } from "./DialogHandler";
|
|
4
4
|
import { FontResolver } from "./FontResolver";
|
|
5
|
-
import { Formatter } from
|
|
5
|
+
import { Formatter } from "./Formatter";
|
|
6
6
|
import { PathResolver } from "./PathResolver";
|
|
7
7
|
import { Widget } from "./Widget";
|
|
8
8
|
import { OPIEvent, OPIEventMap } from "./events";
|
package/dist/types/Widget.d.ts
CHANGED
|
@@ -25,7 +25,7 @@ export declare abstract class Widget {
|
|
|
25
25
|
readonly vars: Map<string, any>;
|
|
26
26
|
private pvs;
|
|
27
27
|
constructor(display: Display, parent?: AbstractContainerWidget | undefined);
|
|
28
|
-
parseNode(node: XMLNode): void
|
|
28
|
+
parseNode(node: XMLNode): Promise<void>;
|
|
29
29
|
getHookedActions(): Action[];
|
|
30
30
|
drawHolder(g: Graphics): void;
|
|
31
31
|
beforeDrawBorder(g: Graphics): void;
|
package/dist/types/index.d.ts
CHANGED
|
@@ -6,10 +6,11 @@ export { Font } from "./Font";
|
|
|
6
6
|
export { FontResolver } from "./FontResolver";
|
|
7
7
|
export { DefaultPathResolver, PathResolver } from "./PathResolver";
|
|
8
8
|
export { Dimension, NullablePoint, Point } from "./positioning";
|
|
9
|
-
export { CompiledFormula, DataSourceStatus } from "./pv/formulas/CompiledFormula";
|
|
9
|
+
export { CompiledFormula, DataSourceStatus, } from "./pv/formulas/CompiledFormula";
|
|
10
10
|
export { FormulaCompiler } from "./pv/formulas/FormulaCompiler";
|
|
11
11
|
export { HistoricalDataProvider } from "./pv/HistoricalDataProvider";
|
|
12
12
|
export { AlarmSeverity, PV } from "./pv/PV";
|
|
13
13
|
export { PVProvider } from "./pv/PVProvider";
|
|
14
14
|
export { Sample } from "./pv/Sample";
|
|
15
|
+
export { TypeHint } from "./pv/TypeHint";
|
|
15
16
|
export { Widget } from "./Widget";
|
package/dist/types/pv/PV.d.ts
CHANGED
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { PVEngine } from "./PVEngine";
|
|
2
2
|
import { PVProvider } from "./PVProvider";
|
|
3
3
|
import { Sample } from "./Sample";
|
|
4
|
+
import { TypeHint } from "./TypeHint";
|
|
4
5
|
export declare class PV {
|
|
5
6
|
readonly name: string;
|
|
6
7
|
readonly pvEngine: PVEngine;
|
|
7
8
|
private _writable;
|
|
8
9
|
private _units?;
|
|
9
10
|
private _labels?;
|
|
11
|
+
private _typeHint?;
|
|
10
12
|
private _lowerDisplayLimit?;
|
|
11
13
|
private _lowerAlarmLimit?;
|
|
12
14
|
private _lowerWarningLimit?;
|
|
@@ -48,6 +50,7 @@ export declare class PV {
|
|
|
48
50
|
get value(): any | undefined;
|
|
49
51
|
get indexValue(): number | undefined;
|
|
50
52
|
get severity(): AlarmSeverity;
|
|
53
|
+
get typeHint(): TypeHint | undefined;
|
|
51
54
|
get alarmName(): string;
|
|
52
55
|
toNumber(): number | null | undefined;
|
|
53
56
|
setSample(sample: Sample): void;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { AlarmSeverity } from "./PV";
|
|
2
|
+
import { TypeHint } from "./TypeHint";
|
|
2
3
|
export interface Sample {
|
|
3
4
|
time: Date;
|
|
4
5
|
value: any;
|
|
@@ -12,4 +13,9 @@ export interface Sample {
|
|
|
12
13
|
* Engineering units
|
|
13
14
|
*/
|
|
14
15
|
units?: string;
|
|
16
|
+
/**
|
|
17
|
+
* Optional type hint for values that are
|
|
18
|
+
* not JavaScript primitives.
|
|
19
|
+
*/
|
|
20
|
+
typeHint?: TypeHint;
|
|
15
21
|
}
|
package/dist/types/pv/sim.d.ts
CHANGED
package/dist/types/utils.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { TypeHint } from "./pv/TypeHint";
|
|
1
2
|
export declare function roundRect(ctx: CanvasRenderingContext2D, x: number, y: number, w: number, h: number, rx: number, ry: number): void;
|
|
2
3
|
export declare function normalizePath(base: string, relPath: string): string;
|
|
3
|
-
export declare function formatValue(value: any, formatType: number, precision: number): string;
|
|
4
|
+
export declare function formatValue(value: any, formatType: number, precision: number, typeHint: TypeHint | undefined): string;
|
|
@@ -9,7 +9,7 @@ export declare class LED extends Widget {
|
|
|
9
9
|
private areaRegion?;
|
|
10
10
|
private states;
|
|
11
11
|
constructor(display: Display, parent: AbstractContainerWidget);
|
|
12
|
-
parseNode(node: XMLNode): void
|
|
12
|
+
parseNode(node: XMLNode): Promise<void>;
|
|
13
13
|
init(): void;
|
|
14
14
|
get booleanValue(): boolean;
|
|
15
15
|
get bulbColor(): Color;
|
|
@@ -8,7 +8,7 @@ export declare class Connection extends Widget {
|
|
|
8
8
|
private sourceWidget?;
|
|
9
9
|
private targetWidget?;
|
|
10
10
|
constructor(display: Display);
|
|
11
|
-
parseNode(node: XMLNode): void
|
|
11
|
+
parseNode(node: XMLNode): Promise<void>;
|
|
12
12
|
draw(g: Graphics): void;
|
|
13
13
|
private drawPath;
|
|
14
14
|
private drawManhattanConnection;
|
|
@@ -9,7 +9,7 @@ export declare class DisplayWidget extends AbstractContainerWidget {
|
|
|
9
9
|
constructor(display: Display, parent?: AbstractContainerWidget, args?: {
|
|
10
10
|
[key: string]: string;
|
|
11
11
|
});
|
|
12
|
-
parseNode(node: XMLNode): void
|
|
12
|
+
parseNode(node: XMLNode): Promise<void>;
|
|
13
13
|
draw(g: Graphics): void;
|
|
14
14
|
measureContentBounds(scaled: boolean): Bounds;
|
|
15
15
|
get autoScaleWidgets(): AutoScaleWidgets;
|
|
@@ -2,7 +2,7 @@ import { Graphics } from "../../Graphics";
|
|
|
2
2
|
import { XMLNode } from "../../XMLNode";
|
|
3
3
|
import { AbstractContainerWidget } from "./AbstractContainerWidget";
|
|
4
4
|
export declare class GroupingContainer extends AbstractContainerWidget {
|
|
5
|
-
parseNode(node: XMLNode): void
|
|
5
|
+
parseNode(node: XMLNode): Promise<void>;
|
|
6
6
|
beforeDrawBorder(g: Graphics): void;
|
|
7
7
|
draw(g: Graphics): void;
|
|
8
8
|
}
|
|
@@ -6,8 +6,8 @@ export declare class LinkingContainer extends AbstractContainerWidget {
|
|
|
6
6
|
private linkedDisplay?;
|
|
7
7
|
resolvedOpiFile?: string;
|
|
8
8
|
constructor(display: Display, parent: AbstractContainerWidget);
|
|
9
|
-
parseNode(node: XMLNode): void
|
|
10
|
-
init(): void
|
|
9
|
+
parseNode(node: XMLNode): Promise<void>;
|
|
10
|
+
init(): Promise<void>;
|
|
11
11
|
draw(g: Graphics): void;
|
|
12
12
|
getLinkedWidget(): import("../..").Widget | undefined;
|
|
13
13
|
get widgets(): import("../..").Widget[];
|
|
@@ -6,7 +6,7 @@ import { AbstractContainerWidget } from "./AbstractContainerWidget";
|
|
|
6
6
|
export declare class TabbedContainer extends AbstractContainerWidget {
|
|
7
7
|
private tabs;
|
|
8
8
|
constructor(display: Display, parent: AbstractContainerWidget);
|
|
9
|
-
parseNode(node: XMLNode): void
|
|
9
|
+
parseNode(node: XMLNode): Promise<void>;
|
|
10
10
|
draw(g: Graphics): void;
|
|
11
11
|
measureTabOffset(g: Graphics): Point;
|
|
12
12
|
private measureLabelHeight;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@yamcs/opi",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.6",
|
|
4
4
|
"description": "OPI Display Renderer",
|
|
5
5
|
"author": "Yamcs Team <yamcs@spaceapplications.com>",
|
|
6
6
|
"repository": {
|
|
@@ -16,7 +16,9 @@
|
|
|
16
16
|
"prepublishOnly": "npm run build",
|
|
17
17
|
"watch": "esbuild src/index.ts --outfile=dist/opi.js --sourcemap --bundle --platform=browser --format=esm --minify --watch",
|
|
18
18
|
"peggy": "cd src/pv/formulas && peggy --format es -o parser.js formula-grammar.peggy",
|
|
19
|
-
"start": "node ./demo/server.js"
|
|
19
|
+
"start": "node ./demo/server.js",
|
|
20
|
+
"prettier:check": "prettier --check '**/*.ts'",
|
|
21
|
+
"prettier:write": "prettier --check --write '**/*.ts'"
|
|
20
22
|
},
|
|
21
23
|
"module": "dist/opi.js",
|
|
22
24
|
"types": "dist/types/index.d.ts",
|
|
@@ -31,6 +33,7 @@
|
|
|
31
33
|
"morgan": "^1.10.0",
|
|
32
34
|
"nunjucks": "^3.2.2",
|
|
33
35
|
"peggy": "4.2.0",
|
|
36
|
+
"prettier": "^3.5.3",
|
|
34
37
|
"tslib": "^2.6.3",
|
|
35
38
|
"typescript": "^5.4.5"
|
|
36
39
|
}
|