chore: test: Change import to import type, jsapi-shim to jsapi-types where possible (#1285)

- Change `import` to `import type`, `jsapi-shim` to `jsapi-types` where
possible.
- Move `jsapi-shim` to `devDependencies`.
- Convert `ChartTestUtils` static methods to instance methods, fix unit
tests.

Author: vbabich

package-lock.json

@@ -2,7 +2,7 @@ import React from 'react';
 import { AUTH_HANDLER_TYPE_ANONYMOUS } from '@deephaven/auth-plugins';
 import { ApiContext } from '@deephaven/jsapi-bootstrap';
 import { BROADCAST_LOGIN_MESSAGE } from '@deephaven/jsapi-utils';
-import {
+import type {
   CoreClient,
   IdeConnection,
   dh as DhType,

packages/app-utils/src/components/AppBootstrap.test.tsx

@@ -1,4 +1,4 @@
-import { ConnectOptions } from '@deephaven/jsapi-types';
+import type { ConnectOptions } from '@deephaven/jsapi-types';
 
 /**
  * Get the base URL of the API

packages/app-utils/src/utils/ConnectUtils.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import { act, render, screen } from '@testing-library/react';
 import { ApiContext, ClientContext } from '@deephaven/jsapi-bootstrap';
 import { dh } from '@deephaven/jsapi-shim';
-import { CoreClient } from '@deephaven/jsapi-types';
+import type { CoreClient } from '@deephaven/jsapi-types';
 import AuthPluginAnonymous from './AuthPluginAnonymous';
 import { AUTH_HANDLER_TYPE_ANONYMOUS as AUTH_TYPE } from './AuthHandlerTypes';
 import { AuthConfigMap } from './AuthPlugin';

packages/auth-plugins/src/AuthPluginAnonymous.test.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { act, render, screen } from '@testing-library/react';
 import { ClientContext } from '@deephaven/jsapi-bootstrap';
-import { CoreClient } from '@deephaven/jsapi-types';
+import type { CoreClient } from '@deephaven/jsapi-types';
 import { TestUtils } from '@deephaven/utils';
 import AuthPluginBase from './AuthPluginBase';
 

packages/auth-plugins/src/AuthPluginBase.test.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { LoadingOverlay } from '@deephaven/components';
 import { useClient } from '@deephaven/jsapi-bootstrap';
 import Log from '@deephaven/log';
-import { LoginOptions } from '@deephaven/jsapi-types';
+import type { LoginOptions } from '@deephaven/jsapi-types';
 import { CanceledPromiseError, getErrorMessage } from '@deephaven/utils';
 import AuthenticationError from './AuthenticationError';
 

packages/auth-plugins/src/AuthPluginBase.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { act, render, screen } from '@testing-library/react';
 import { ApiContext, ClientContext } from '@deephaven/jsapi-bootstrap';
 import { dh } from '@deephaven/jsapi-shim';
-import { CoreClient, LoginOptions } from '@deephaven/jsapi-types';
+import type { CoreClient, LoginOptions } from '@deephaven/jsapi-types';
 import AuthPluginParent from './AuthPluginParent';
 import { AuthConfigMap } from './AuthPlugin';
 

packages/auth-plugins/src/AuthPluginParent.test.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { LoginOptions } from '@deephaven/jsapi-types';
+import type { LoginOptions } from '@deephaven/jsapi-types';
 import {
   LOGIN_OPTIONS_REQUEST,
   requestParentResponse,

packages/auth-plugins/src/AuthPluginParent.tsx

@@ -4,7 +4,7 @@ import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { ApiContext, ClientContext } from '@deephaven/jsapi-bootstrap';
 import { dh } from '@deephaven/jsapi-shim';
-import { CoreClient } from '@deephaven/jsapi-types';
+import type { CoreClient } from '@deephaven/jsapi-types';
 import AuthPluginPsk from './AuthPluginPsk';
 import { AUTH_HANDLER_TYPE_PSK as AUTH_TYPE } from './AuthHandlerTypes';
 import { AuthConfigMap } from './AuthPlugin';

packages/auth-plugins/src/AuthPluginPsk.test.tsx

@@ -1,10 +1,14 @@
-import dh, {
+import type {
   Axis,
+  AxisFormatType,
+  AxisPosition,
+  AxisType,
   Chart,
+  dh as DhType,
   Figure,
   Series,
   SeriesDataSource,
-} from '@deephaven/jsapi-shim';
+} from '@deephaven/jsapi-types';
 
 class ChartTestUtils {
   static DEFAULT_CHART_TITLE = 'Chart Title';
@@ -15,73 +19,85 @@ class ChartTestUtils {
 
   static DEFAULT_SERIES_NAME = 'MySeries';
 
-  static makeAxis({
+  private dh: DhType;
+
+  constructor(dh: DhType) {
+    this.dh = dh;
+  }
+
+  makeAxis({
     label = 'Axis',
-    type = dh.plot.AxisType.X,
-    position = dh.plot.AxisPosition.BOTTOM,
-    formatType = dh.Axis.FORMAT_TYPE_NUMBER,
+    type = undefined,
+    position = undefined,
+    formatType = undefined,
     formatPattern = '###,###0.00',
     log = false,
+  }: {
+    label?: string;
+    type?: AxisType;
+    position?: AxisPosition;
+    formatType?: AxisFormatType;
+    formatPattern?: string;
+    log?: boolean;
   } = {}): Axis {
+    const { dh } = this;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     return new (dh as any).Axis({
       label,
-      type,
-      position,
-      formatType,
+      type: type ?? dh.plot.AxisType.X,
+      position: position ?? dh.plot.AxisPosition.BOTTOM,
+      formatType: formatType ?? dh.Axis.FORMAT_TYPE_NUMBER,
       formatPattern,
       log,
     });
   }
 
-  static makeDefaultAxes(): Axis[] {
+  makeDefaultAxes(): Axis[] {
+    const { dh } = this;
     return [
-      ChartTestUtils.makeAxis({
+      this.makeAxis({
         label: ChartTestUtils.DEFAULT_X_TITLE,
         type: dh.plot.AxisType.X,
       }),
-      ChartTestUtils.makeAxis({
+      this.makeAxis({
         label: ChartTestUtils.DEFAULT_Y_TITLE,
         type: dh.plot.AxisType.Y,
       }),
     ];
   }
 
-  static makeSource({
-    axis = ChartTestUtils.makeAxis(),
-  }: {
-    axis: Axis;
-  }): SeriesDataSource {
+  makeSource({ axis = this.makeAxis() }: { axis: Axis }): SeriesDataSource {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    return new (dh as any).SeriesDataSource({ axis, type: axis.type });
+    return new (this.dh as any).SeriesDataSource({ axis, type: axis.type });
   }
 
-  static makeDefaultSources(): SeriesDataSource[] {
-    const axes = ChartTestUtils.makeDefaultAxes();
-    return axes.map(axis => ChartTestUtils.makeSource({ axis }));
+  makeDefaultSources(): SeriesDataSource[] {
+    const axes = this.makeDefaultAxes();
+    return axes.map(axis => this.makeSource({ axis }));
   }
 
-  static makeSeries({
+  makeSeries({
     name = ChartTestUtils.DEFAULT_SERIES_NAME,
-    plotStyle = dh.plot.SeriesPlotStyle.SCATTER,
-    sources = ChartTestUtils.makeDefaultSources(),
+    plotStyle = null,
+    sources = this.makeDefaultSources(),
     lineColor = null,
     shapeColor = null,
   } = {}): Series {
+    const { dh } = this;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     return new (dh as any).Series(
       name,
-      plotStyle,
+      plotStyle ?? dh.plot.SeriesPlotStyle.SCATTER,
       sources,
       lineColor,
       shapeColor
     );
   }
 
-  static makeChart({
+  makeChart({
     title = ChartTestUtils.DEFAULT_CHART_TITLE,
-    series = [ChartTestUtils.makeSeries()],
-    axes = ChartTestUtils.makeDefaultAxes(),
+    series = [this.makeSeries()],
+    axes = this.makeDefaultAxes(),
     showLegend = null,
     rowspan = 1,
     colspan = 1,
@@ -98,7 +114,7 @@ class ChartTestUtils {
     column?: number;
   } = {}): Chart {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    return new (dh as any).Chart({
+    return new (this.dh as any).Chart({
       title,
       series,
       axes,
@@ -110,14 +126,14 @@ class ChartTestUtils {
     });
   }
 
-  static makeFigure({
+  makeFigure({
     title = 'Figure',
-    charts = [ChartTestUtils.makeChart()],
+    charts = [this.makeChart()],
     rows = 1,
     cols = 1,
   } = {}): Figure {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    return new (dh as any).plot.Figure({ title, charts, rows, cols });
+    return new (this.dh as any).plot.Figure({ title, charts, rows, cols });
   }
 }