Vtypes

src/components/AlarmBorder/alarmBorder.tsx

@@ -1,25 +1,23 @@
 import React, { ReactNode } from "react";
-import { Alarm, NType } from "../../ntypes";
+import { VType } from "../../vtypes/vtypes";
+import { Alarm, alarmOf, AlarmSeverity } from "../../vtypes/alarm";
 
 import classes from "./alarmBorder.module.css";
 
 export const AlarmBorder = (props: {
   connected: boolean;
-  value?: NType;
+  value?: VType;
   children: ReactNode;
 }): JSX.Element => {
   let { connected, value = null } = props;
-  let alarm: Alarm = { severity: 0, status: 0, message: "" };
-  if (value && value.alarm) {
-    alarm = value.alarm;
-  }
+  let alarm: Alarm = alarmOf(value);
   // Sort out alarm border classes
   let alarmClasses = [classes.Border, classes.Children];
   if (connected === false) {
     alarmClasses.push(classes.NotConnected);
-  } else if (alarm.severity === 1) {
+  } else if (alarm.getSeverity() === AlarmSeverity.MINOR) {
     alarmClasses.push(classes.MinorAlarm);
-  } else if (alarm.severity === 2) {
+  } else if (alarm.getSeverity() === AlarmSeverity.MAJOR) {
     alarmClasses.push(classes.MajorAlarm);
   }
 

src/components/ConnectionWrapper/connectionWrapper.tsx

@@ -3,7 +3,7 @@ import { useId } from "react-id-generator";
 import { useSubscription } from "../../hooks/useCs";
 import { useSelector } from "react-redux";
 import { CsState } from "../../redux/csState";
-import { NType } from "../../ntypes";
+import { VType } from "../../vtypes/vtypes";
 
 export interface PvProps extends React.PropsWithChildren<any> {
   pvName: string;
@@ -22,7 +22,7 @@ export const connectionWrapper = <P extends object>(
     useSubscription(id, props.pvName);
     const [connected, latestValue] = useSelector((state: CsState): [
       boolean,
-      NType?
+      VType?
     ] => {
       let pvState = state.valueCache[props.pvName];
       let connected = false;

src/components/CopyWrapper/copyWrapper.tsx

@@ -8,18 +8,21 @@ import copyToClipboard from "clipboard-copy";
 import Popover from "react-tiny-popover";
 
 import { connectionWrapper } from "../ConnectionWrapper/connectionWrapper";
-import { NType } from "../../ntypes";
+import { VType } from "../../vtypes/vtypes";
 import classes from "./copyWrapper.module.css";
+import { vtypeToString } from "../../vtypes/utils";
+import { timeOf } from "../../vtypes/time";
+import { alarmOf } from "../../vtypes/alarm";
 
 export const CopyWrapper = (props: {
   pvName: string;
   connected: boolean;
-  value?: NType;
+  value?: VType;
   children: ReactNode;
   style?: object;
 }): JSX.Element => {
   const [popoverOpen, setPopoverOpen] = useState(false);
-  let { connected, pvName, value = null } = props;
+  let { connected, pvName, value } = props;
 
   let displayValue = "";
   if (!connected) {
@@ -28,7 +31,7 @@ export const CopyWrapper = (props: {
     if (!value) {
       displayValue = "Warning: Waiting for value";
     } else {
-      displayValue = value.value.toString();
+      displayValue = vtypeToString(value);
     }
   }
 
@@ -48,14 +51,16 @@ export const CopyWrapper = (props: {
     }
   };
   // Compose the text which should be shown on the tooltip
+  let time = timeOf(value);
+  let alarm = alarmOf(value);
   let toolTipText = [
     displayValue,
     value
-      ? value.time
-        ? new Date(value.time.secondsPastEpoch * 1000)
+      ? time
+        ? new Date(time.getInstant().secondsPastEpoch * 1000)
         : ""
       : "",
-    value ? (value.alarm ? value.alarm.message : "") : ""
+    value ? (alarm ? alarm.getName() : "") : ""
   ]
     .filter((word): boolean => word !== "")
     .join(", ");

src/components/Input/input.tsx

@@ -1,9 +1,10 @@
 import React, { useState } from "react";
 import { connectionWrapper } from "../ConnectionWrapper/connectionWrapper";
 import { writePv } from "../../hooks/useCs";
-import { NType, ntOrNullToString } from "../../ntypes";
+import { VType } from "../../vtypes/vtypes";
 
 import classes from "./input.module.css";
+import { vtypeToString, stringToVtype } from "../../vtypes/utils";
 
 export interface InputProps {
   pvName: string;
@@ -32,7 +33,7 @@ interface ConnectedInputProps {
 
 interface SmartInputProps {
   pvName: string;
-  value?: NType;
+  value?: VType;
 }
 
 export const SmartInput: React.FC<SmartInputProps> = (
@@ -42,10 +43,7 @@ export const SmartInput: React.FC<SmartInputProps> = (
   const [editing, setEditing] = useState(false);
   function onKeyDown(event: React.KeyboardEvent<HTMLInputElement>): void {
     if (event.key === "Enter") {
-      writePv(props.pvName, {
-        type: "NTScalar",
-        value: event.currentTarget.value
-      });
+      writePv(props.pvName, stringToVtype(event.currentTarget.value));
       setInputValue("");
       setEditing(false);
     }
@@ -63,11 +61,11 @@ export const SmartInput: React.FC<SmartInputProps> = (
   function onBlur(event: React.ChangeEvent<HTMLInputElement>): void {
     setEditing(false);
     /* When focus lost show PV value. */
-    setInputValue(ntOrNullToString(props.value));
+    setInputValue(vtypeToString(props.value));
   }
 
-  if (!editing && inputValue !== ntOrNullToString(props.value)) {
-    setInputValue(ntOrNullToString(props.value));
+  if (!editing && inputValue !== vtypeToString(props.value)) {
+    setInputValue(vtypeToString(props.value));
   }
 
   return (

src/components/ProgressBar/progressBar.tsx

@@ -1,15 +1,16 @@
 import React from "react";
 
-import { NType, ntOrNullToNumber } from "../../ntypes";
+import { VType } from "../../vtypes/vtypes";
 import classes from "./progressBar.module.css";
 
 import { connectionWrapper } from "../ConnectionWrapper/connectionWrapper";
 import { CopyWrapper } from "../CopyWrapper/copyWrapper";
 import { AlarmBorder } from "../AlarmBorder/alarmBorder";
+import { vtypeOrUndefinedToNumber } from "../../vtypes/utils";
 
 interface ProgressBarProps {
   connected: boolean;
-  value?: NType;
+  value?: VType;
   min: number;
   max: number;
   vertical?: boolean;
@@ -25,7 +26,7 @@ interface ProgressBarProps {
 // Same as ProgressBarProps but without connected and value as these are
 // collected from the store
 interface ConnectedProgressBarProps {
-  value?: NType;
+  value?: VType;
   pvName: string;
   min: number;
   max: number;
@@ -62,7 +63,8 @@ export const ProgressBar: React.FC<ProgressBarProps> = (
     height: height,
     width: width
   };
-  let numValue = ntOrNullToNumber(value);
+  // eslint-disable-next-line no-undef
+  let numValue = vtypeOrUndefinedToNumber(value);
   let onPercent =
     numValue < min
       ? 0
@@ -116,7 +118,7 @@ export const ConnectedProgressBar: React.FC<
 
 export const StandaloneProgressBar = (props: {
   pvName: string;
-  value: NType;
+  value: VType;
   connected: boolean;
   min: number;
   max: number;

src/components/Readback/readback.test.tsx

@@ -2,24 +2,20 @@ import React from "react";
 import { Readback } from "./readback";
 import { shallow } from "enzyme";
 import renderer from "react-test-renderer";
+import { vstringOf } from "../../vtypes/vtypes";
+import { stringToVtype } from "../../vtypes/utils";
 
 test("snapshot matches", (): void => {
   const readback = renderer.create(
-    <Readback
-      connected={true}
-      value={{ type: "NTScalarDouble", value: "hello" }}
-    />
+    <Readback connected={true} value={vstringOf("hello")} />
   );
   let json = readback.toJSON();
   expect(json).toMatchSnapshot();
 });
 
 it("renders a basic element", (): void => {
   const wrapper = shallow(
-    <Readback
-      connected={true}
-      value={{ type: "NTScalarDouble", value: "hello" }}
-    />
+    <Readback connected={true} value={vstringOf("hello")} />
   );
   expect(wrapper.text()).toEqual("hello");
 });
@@ -28,7 +24,7 @@ it("applies precision to numbers", (): void => {
   const wrapper = shallow(
     <Readback
       connected={true}
-      value={{ type: "NTScalarDouble", value: "3.14159265359" }}
+      value={stringToVtype("3.14159265359")}
       precision={2}
     />
   );

src/components/Readback/readback.tsx

@@ -1,20 +1,16 @@
 import React from "react";
-import {
-  NType,
-  Alarm,
-  NO_ALARM,
-  ntToNumericString,
-  ntToString
-} from "../../ntypes";
 import { connectionWrapper } from "../ConnectionWrapper/connectionWrapper";
 import { CopyWrapper } from "../CopyWrapper/copyWrapper";
 import { AlarmBorder } from "../AlarmBorder/alarmBorder";
 
 import classes from "./readback.module.css";
+import { VType } from "../../vtypes/vtypes";
+import { Alarm, alarmOf, AlarmSeverity } from "../../vtypes/alarm";
+import { vtypeToString } from "../../vtypes/utils";
 
 export const Readback = (props: {
   connected: boolean;
-  value?: NType;
+  value?: VType;
   precision?: number;
   style?: {};
 }): JSX.Element => {
@@ -24,18 +20,12 @@ export const Readback = (props: {
     precision = undefined,
     style = { backgroundColor: "#383838", color: "#00bb00" }
   } = props;
-  let alarm = NO_ALARM;
-  if (value && value.alarm != null) {
-    alarm = value.alarm;
-  }
+  const alarm = alarmOf(value);
   let displayedValue;
   if (!value) {
     displayedValue = "Waiting for value";
-  } else if (precision && precision >= 0) {
-    value = value as NType;
-    displayedValue = ntToNumericString(value, precision);
   } else {
-    displayedValue = ntToString(value);
+    displayedValue = vtypeToString(value, precision);
   }
 
   // Change text color depending on connection state or alarm
@@ -44,13 +34,13 @@ export const Readback = (props: {
       ...style,
       color: "#ffffff"
     };
-  } else if (alarm.severity === 1) {
+  } else if (alarm.getSeverity() === AlarmSeverity.MINOR) {
     // Minor alarm
     style = {
       ...style,
       color: "#eeee00"
     };
-  } else if (alarm.severity === 2) {
+  } else if (alarm.getSeverity() === AlarmSeverity.MAJOR) {
     // Major alarm
     style = {
       ...style,
@@ -84,7 +74,7 @@ interface ConnectedCopyReadbackProps {
 
 export const CopyReadback = (props: {
   pvName: string;
-  value: NType;
+  value: VType;
   connected: boolean;
   precision?: number;
   style?: object;
@@ -114,7 +104,7 @@ interface ConnectedStandaloneReadbackProps {
 
 export const StandaloneReadback = (props: {
   pvName: string;
-  value: NType;
+  value: VType;
   connected: boolean;
   precision?: number;
   style?: object;

src/components/SlideControl/slideControl.tsx

@@ -4,15 +4,16 @@
 import React, { useState } from "react";
 import { ProgressBar } from "../ProgressBar/progressBar";
 import { writePv } from "../../hooks/useCs";
-import { NType, ntOrNullToString } from "../../ntypes";
+import { VType } from "../../vtypes/vtypes";
 
 import classes from "./slideControl.module.css";
 import { connectionWrapper } from "../ConnectionWrapper/connectionWrapper";
+import { vtypeToString, stringToVtype } from "../../vtypes/utils";
 
 interface SlideControlProps {
   pvName: string;
   connected: boolean;
-  value?: NType;
+  value?: VType;
   min: number;
   max: number;
   vertical?: boolean;
@@ -57,13 +58,10 @@ export const SlideControl: React.FC<SlideControlProps> = (
   }
   function onMouseUp(event: React.MouseEvent<HTMLInputElement>): void {
     setEditing(false);
-    writePv(pvName, {
-      type: "NTScalar",
-      value: event.currentTarget.value
-    });
+    writePv(pvName, stringToVtype(event.currentTarget.value));
   }
 
-  let stringValue = ntOrNullToString(value);
+  let stringValue = vtypeToString(value);
   if (!editing && inputValue !== stringValue) {
     setInputValue(stringValue);
   }

src/connection/coniql.ts

@@ -5,7 +5,7 @@ import { WebSocketLink } from "apollo-link-ws";
 import { getMainDefinition } from "apollo-utilities";
 import gql from "graphql-tag";
 import { InMemoryCache, NormalizedCacheObject } from "apollo-cache-inmemory";
-import { NType } from "../ntypes";
+import { VType, vdoubleOf } from "../vtypes/vtypes";
 import {
   Connection,
   ConnectionChangedCallback,
@@ -87,12 +87,12 @@ export class ConiqlPlugin implements Connection {
       });
   }
 
-  public putPv(pvName: string, value: NType): void {
+  public putPv(pvName: string, value: VType): void {
     // noop
   }
 
-  public getValue(pvName: string): NType {
-    return { type: "NTScalarDouble", value: "" };
+  public getValue(pvName: string): VType {
+    return vdoubleOf(0);
   }
 
   public unsubscribe(pvName: string): void {

src/connection/plugin.ts

@@ -1,4 +1,4 @@
-import { NType } from "../ntypes";
+import { VType } from "../vtypes/vtypes";
 
 export const nullConnCallback: ConnectionChangedCallback = (_p, _v): void => {};
 export const nullValueCallback: ValueChangedCallback = (_p, _v): void => {};
@@ -11,12 +11,12 @@ export type ConnectionChangedCallback = (
   pvName: string,
   value: ConnectionState
 ) => void;
-export type ValueChangedCallback = (pvName: string, value: NType) => void;
+export type ValueChangedCallback = (pvName: string, value: VType) => void;
 
 export interface Connection {
   subscribe: (pvName: string) => void;
-  putPv: (pvName: string, value: NType) => void;
-  getValue: (pvName: string) => NType;
+  putPv: (pvName: string, value: VType) => void;
+  getValue: (pvName: string) => VType;
   connect: (
     connectionCallback: ConnectionChangedCallback,
     valueCallback: ValueChangedCallback