Fixed types (DH-18086)

packages/app-utils/src/components/ConnectionBootstrap.tsx

@@ -85,7 +85,7 @@ export function ConnectionBootstrap({
       if (connection == null || isShutdown) return;
 
       // handles the disconnect event
-      function handleDisconnect(event: CustomEvent): void {
+      function handleDisconnect(event: dh.Event<unknown>): void {
         const { detail } = event;
         log.info('Disconnect', `${JSON.stringify(detail)}`);
         setConnectionState('reconnecting');
@@ -105,7 +105,7 @@ export function ConnectionBootstrap({
       if (connection == null || isShutdown) return;
 
       // handles the reconnect event
-      function handleReconnect(event: CustomEvent): void {
+      function handleReconnect(event: dh.Event<unknown>): void {
         const { detail } = event;
         log.info('Reconnect', `${JSON.stringify(detail)}`);
         setConnectionState('connected');
@@ -125,7 +125,7 @@ export function ConnectionBootstrap({
       if (connection == null) return;
 
       // handles the shutdown event
-      function handleShutdown(event: CustomEvent): void {
+      function handleShutdown(event: dh.Event<unknown>): void {
         const { detail } = event;
         log.info('Shutdown', `${JSON.stringify(detail)}`);
         setError(`Server shutdown: ${detail ?? 'Unknown reason'}`);
@@ -146,7 +146,7 @@ export function ConnectionBootstrap({
       if (connection == null || isShutdown) return;
 
       // handles the auth failed event
-      function handleAuthFailed(event: CustomEvent): void {
+      function handleAuthFailed(event: dh.Event<unknown>): void {
         const { detail } = event;
         log.warn(
           'Reconnect authentication failed',

packages/chart/src/Chart.tsx

@@ -19,6 +19,7 @@ import {
   type DateTimeFormatSettings,
 } from '@deephaven/jsapi-utils';
 import Log from '@deephaven/log';
+import type { dh as DhType } from '@deephaven/jsapi-types';
 import {
   type Config as PlotlyConfig,
   type Layout,
@@ -440,7 +441,7 @@ class Chart extends Component<ChartProps, ChartState> {
     this.setState({ downsamplingError: null });
   }
 
-  handleModelEvent(event: CustomEvent): void {
+  handleModelEvent(event: DhType.Event<unknown>): void {
     const { type, detail } = event;
     log.debug2('Received data update', type, detail);
 
@@ -453,7 +454,7 @@ class Chart extends Component<ChartProps, ChartState> {
             layout.datarevision += 1;
           }
           return {
-            data: detail,
+            data: detail as Partial<Data>[] | null,
             layout,
             revision: revision + 1,
           };
@@ -497,7 +498,8 @@ class Chart extends Component<ChartProps, ChartState> {
       }
       case ChartModel.EVENT_DOWNSAMPLENEEDED:
       case ChartModel.EVENT_DOWNSAMPLEFAILED: {
-        const downsamplingError = detail.message ?? detail;
+        const downsamplingError =
+          (detail as { message?: string }).message ?? detail;
         this.setState({
           isDownsampleFinished: false,
           isDownsampleInProgress: false,
@@ -506,7 +508,11 @@ class Chart extends Component<ChartProps, ChartState> {
         });
 
         const { onError } = this.props;
-        onError(new DownsamplingError(downsamplingError));
+        onError(
+          new DownsamplingError(
+            downsamplingError == null ? undefined : `${downsamplingError}`
+          )
+        );
         break;
       }
       case ChartModel.EVENT_ERROR: {

packages/chart/src/ChartModel.ts

@@ -6,7 +6,16 @@ import { type Formatter } from '@deephaven/jsapi-utils';
 import type { Layout, Data } from 'plotly.js';
 import { type FilterColumnMap, type FilterMap } from './ChartUtils';
 
-export type ChartEvent = CustomEvent;
+export type ChartEvent = DhType.Event<unknown>;
+
+export interface FigureUpdateEventData {
+  series: DhType.plot.Series[];
+  getArray: (
+    series: DhType.plot.Series,
+    sourceType: number,
+    mappingFunc: (value: unknown) => unknown
+  ) => unknown[];
+}
 
 export type RenderOptions = {
   /** Allow WebGL as an option. Defaults to `true`, explicitly set to `false` to disable. */

packages/chart/src/FigureChartModel.ts

@@ -17,7 +17,11 @@ import type {
   DateTimeColumnFormatter,
   Formatter,
 } from '@deephaven/jsapi-utils';
-import ChartModel, { type ChartEvent, type RenderOptions } from './ChartModel';
+import ChartModel, {
+  type ChartEvent,
+  type FigureUpdateEventData,
+  type RenderOptions,
+} from './ChartModel';
 import ChartUtils, {
   type AxisTypeMap,
   type ChartModelSettings,
@@ -472,7 +476,7 @@ class FigureChartModel extends ChartModel {
     this.fireDownsampleNeeded(event.detail);
   }
 
-  handleFigureUpdated(event: ChartEvent): void {
+  handleFigureUpdated(event: DhType.Event<FigureUpdateEventData>): void {
     const { detail: figureUpdateEvent } = event;
     const { series: seriesArray } = figureUpdateEvent;
 
@@ -549,7 +553,7 @@ class FigureChartModel extends ChartModel {
     this.resubscribe();
   }
 
-  handleFigureDisconnected(event: CustomEvent): void {
+  handleFigureDisconnected(event: DhType.Event<unknown>): void {
     log.debug('Figure disconnected', event);
 
     this.isConnected = false;
@@ -561,7 +565,7 @@ class FigureChartModel extends ChartModel {
     this.fireDisconnect();
   }
 
-  handleFigureReconnected(event: CustomEvent): void {
+  handleFigureReconnected(event: DhType.Event<unknown>): void {
     log.debug('Figure reconnected', event);
 
     this.isConnected = true;

packages/console/src/Console.tsx

@@ -339,10 +339,20 @@ export class Console extends PureComponent<ConsoleProps, ConsoleState> {
     this.consoleInput.current?.clear();
   }
 
-  handleCommandStarted(event: CustomEvent): void {
+  handleCommandStarted(
+    event: DhType.Event<{
+      code: string;
+      result: {
+        message: string;
+        error?: string;
+        changes: DhType.ide.VariableChanges;
+        cancel: () => unknown;
+      };
+    }>
+  ): void {
     const { code, result } = event.detail;
     const wrappedResult = this.pending.add(result);
-    const historyItem = {
+    const historyItem: ConsoleHistoryActionItem = {
       command: code,
       disabledObjects: [],
       startTime: Date.now(),

packages/console/src/ConsoleStatusBar.tsx

@@ -35,18 +35,21 @@ function ConsoleStatusBar({
 }: ConsoleStatusBarProps): ReactElement {
   const [pendingCommandCount, setPendingCommandCount] = useState(0);
 
-  const handleCommandStarted = useCallback(async (event: CustomEvent) => {
-    setPendingCommandCount(count => count + 1);
+  const handleCommandStarted = useCallback(
+    async (event: DhType.Event<{ result: Promise<unknown> }>) => {
+      setPendingCommandCount(count => count + 1);
 
-    try {
-      const { result } = event.detail;
-      await result;
-    } catch (error) {
-      // No-op, fall through
-    }
+      try {
+        const { result } = event.detail;
+        await result;
+      } catch (error) {
+        // No-op, fall through
+      }
 
-    setPendingCommandCount(count => count - 1);
-  }, []);
+      setPendingCommandCount(count => count - 1);
+    },
+    []
+  );
 
   useEffect(
     function startListening() {

packages/iris-grid/src/AdvancedFilterCreatorSelectValueList.tsx

@@ -167,7 +167,7 @@ class AdvancedFilterCreatorSelectValueList<T = unknown> extends PureComponent<
     this.updateItemSelection();
   }
 
-  handleTableUpdate(event: CustomEvent): void {
+  handleTableUpdate(event: DhType.Event<DhType.ViewportData>): void {
     const { table, formatter } = this.props;
     if (!table) return;
 

packages/iris-grid/src/IrisGrid.tsx

@@ -2101,7 +2101,7 @@ class IrisGrid extends Component<IrisGridProps, IrisGridState> {
     // It's possible that the key table does not have any rows of data yet, so just wait until it does have one
     keyTable.addEventListener(
       dh.Table.EVENT_UPDATED,
-      (event: CustomEvent<DhType.ViewportData>) => {
+      (event: DhType.Event<DhType.ViewportData>) => {
         try {
           const { detail: data } = event;
           if (data.rows.length === 0) {

packages/iris-grid/src/IrisGridTableModelTemplate.ts

@@ -337,19 +337,19 @@ class IrisGridTableModelTemplate<
     this.dispatchEvent(new EventShimCustomEvent(IrisGridModel.EVENT.RECONNECT));
   }
 
-  handleTableUpdate(event: CustomEvent): void {
+  handleTableUpdate(event: DhType.Event<DhType.ViewportData>): void {
     this.copyViewportData(event.detail);
 
     this.dispatchEvent(new EventShimCustomEvent(IrisGridModel.EVENT.UPDATED));
   }
 
-  handleTotalsUpdate(event: CustomEvent): void {
+  handleTotalsUpdate(event: DhType.Event<DhType.ViewportData>): void {
     this.copyTotalsData(event.detail);
 
     this.dispatchEvent(new EventShimCustomEvent(IrisGridModel.EVENT.UPDATED));
   }
 
-  handleRequestFailed(event: CustomEvent): void {
+  handleRequestFailed(event: DhType.Event<unknown>): void {
     this.dispatchEvent(
       new EventShimCustomEvent(IrisGridModel.EVENT.REQUEST_FAILED, event)
     );

packages/jsapi-components/src/TableDropdown.tsx

@@ -80,7 +80,7 @@ export function TableDropdown({
 
     subscription.addEventListener(
       dh.Table.EVENT_UPDATED,
-      (event: CustomEvent<DhType.ViewportData>) => {
+      (event: DhType.Event<DhType.ViewportData>) => {
         const { detail } = event;
         // Core JSAPI returns undefined for null table values,
         // coalesce with null to differentiate null from no selection in the dropdown

packages/jsapi-components/src/useTableListener.ts

@@ -7,7 +7,7 @@ const log = Log.module('useTableListener');
 export const useTableListener = <T = unknown>(
   eventEmitter: dh.HasEventHandling | undefined | null,
   eventName: string,
-  callback: (event: CustomEvent<T>) => void
+  callback: (event: dh.Event<T>) => void
 ): void =>
   useEffect(
     function initEventEmitter() {

packages/jsapi-utils/src/SessionUtils.ts

@@ -24,18 +24,6 @@ export interface SessionWrapper {
   dh: typeof DhType;
 }
 
-/**
- * @returns New connection to the server
- */
-export function createConnection(
-  dh: typeof DhType,
-  websocketUrl: string
-): DhType.IdeConnection {
-  log.info(`Starting connection to '${websocketUrl}'...`);
-
-  return new dh.IdeConnection(websocketUrl);
-}
-
 /**
  * Create a new session using the default URL
  * @returns A session and config that is ready to use

packages/jsapi-utils/src/TableUtils.ts

@@ -628,8 +628,8 @@ export class TableUtils {
     table: DhType.Table | DhType.TreeTable,
     eventName: string,
     timeout = 0,
-    matcher: ((event: CustomEvent) => boolean) | null = null
-  ): CancelablePromise<CustomEvent> {
+    matcher: ((event: DhType.Event<unknown>) => boolean) | null = null
+  ): CancelablePromise<DhType.Event<unknown>> {
     let eventCleanup: () => void;
     let timeoutId: ReturnType<typeof setTimeout>;
     let isPending = true;
@@ -650,7 +650,7 @@ export class TableUtils {
         isPending = false;
         resolve(event);
       });
-    }) as CancelablePromise<CustomEvent>;
+    }) as CancelablePromise<DhType.Event<unknown>>;
     wrappedPromise.cancel = () => {
       if (isPending) {
         log.debug2('Pending promise cleanup.');

packages/jsapi-utils/src/ViewportDataUtils.ts

@@ -6,7 +6,7 @@ import { type KeyedItem, type ValueOf } from '@deephaven/utils';
 
 export const ITEM_KEY_PREFIX = 'DH_ITEM_KEY';
 
-export type OnTableUpdatedEvent = CustomEvent<{
+export type OnTableUpdatedEvent = dh.Event<{
   offset: number;
   columns: dh.Column[];
   rows: dh.Row[];