refactor: Switch to generated jsapi types (#1842)

Fixes #1770

Author: mattrunyon

jest.config.base.cjs

@@ -63,8 +63,11 @@ module.exports = {
     ),
     // Handle monaco worker files
     '\\.worker.*$': 'identity-obj-proxy',
-    // All packages except icons use src code
-    '^@deephaven/(?!icons)(.*)$': path.join(__dirname, './packages/$1/src'),
+    // All packages except icons and jsapi-types use src code
+    '^@deephaven/(?!icons|jsapi-types)(.*)$': path.join(
+      __dirname,
+      './packages/$1/src'
+    ),
   },
   testEnvironment: 'jsdom',
   setupFilesAfterEnv: [path.join(__dirname, './jest.setup.ts')],

package-lock.json

@@ -174,7 +174,7 @@
     "@deephaven/jsapi-bootstrap": "file:packages/jsapi-bootstrap",
     "@deephaven/jsapi-components": "file:packages/jsapi-components",
     "@deephaven/jsapi-shim": "file:packages/jsapi-shim",
-    "@deephaven/jsapi-types": "file:packages/jsapi-types",
+    "@deephaven/jsapi-types": "1.0.0-dev0.33.1",
     "@deephaven/jsapi-utils": "file:packages/jsapi-utils",
     "@deephaven/log": "file:packages/log",
     "@deephaven/mocks": "file:packages/mocks",

package.json

@@ -39,7 +39,7 @@
     "@deephaven/iris-grid": "file:../iris-grid",
     "@deephaven/jsapi-bootstrap": "file:../jsapi-bootstrap",
     "@deephaven/jsapi-components": "file:../jsapi-components",
-    "@deephaven/jsapi-types": "file:../jsapi-types",
+    "@deephaven/jsapi-types": "1.0.0-dev0.33.1",
     "@deephaven/jsapi-utils": "file:../jsapi-utils",
     "@deephaven/log": "file:../log",
     "@deephaven/plugin": "file:../plugin",

packages/app-utils/package.json

@@ -48,7 +48,10 @@ export function AuthBootstrap({ children }: AuthBootstrapProps): JSX.Element {
       let isCanceled = false;
       async function loadAuthConfigValues(): Promise<void> {
         try {
-          const newAuthConfigValues = await client.getAuthConfigValues();
+          const newAuthConfigValues = (await client.getAuthConfigValues()) as [
+            string,
+            string,
+          ][];
           if (!isCanceled) {
             setAuthConfig(new Map(newAuthConfigValues));
           }

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

@@ -6,7 +6,7 @@ import {
   useApi,
   useClient,
 } from '@deephaven/jsapi-bootstrap';
-import type { IdeConnection, VariableDescriptor } from '@deephaven/jsapi-types';
+import type { dh } from '@deephaven/jsapi-types';
 import Log from '@deephaven/log';
 import { assertNotNull } from '@deephaven/utils';
 import ConnectionContext from './ConnectionContext';
@@ -30,7 +30,7 @@ export function ConnectionBootstrap({
   const api = useApi();
   const client = useClient();
   const [error, setError] = useState<unknown>();
-  const [connection, setConnection] = useState<IdeConnection>();
+  const [connection, setConnection] = useState<dh.IdeConnection>();
   useEffect(
     function initConnection() {
       let isCanceled = false;
@@ -76,7 +76,7 @@ export function ConnectionBootstrap({
   );
 
   const objectFetcher = useCallback(
-    async (descriptor: VariableDescriptor) => {
+    async (descriptor: dh.ide.VariableDescriptor) => {
       assertNotNull(connection, 'No connection available to fetch object with');
       return connection.getObject(sanitizeVariableDescriptor(descriptor));
     },

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

@@ -1,6 +1,6 @@
 import { createContext } from 'react';
-import type { IdeConnection } from '@deephaven/jsapi-types';
+import type { dh } from '@deephaven/jsapi-types';
 
-export const ConnectionContext = createContext<IdeConnection | null>(null);
+export const ConnectionContext = createContext<dh.IdeConnection | null>(null);
 
 export default ConnectionContext;

packages/app-utils/src/components/ConnectionContext.ts

@@ -29,7 +29,8 @@ export function ServerConfigBootstrap({
       let isCanceled = false;
       async function loadServerConfigValues(): Promise<void> {
         try {
-          const newServerConfigValues = await client.getServerConfigValues();
+          const newServerConfigValues =
+            (await client.getServerConfigValues()) as [string, string][];
           if (!isCanceled) {
             setServerConfig(new Map(newServerConfigValues));
           }