Moved ent jsapi-types directory (#79)

deephaven · Sep 13, 2024 · a501522 · a501522
1 parent 73499ac
commit a501522
Show file tree

Hide file tree

Showing 10 changed files with 72 additions and 14 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/enterprise-jsapi-types/package.json b/packages/enterprise-jsapi-types/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "@deephaven-enterprise/jsapi-types",
+  "version": "0.0.1",
+  "description": "Deephaven Enterprise Jsapi Types",
+  "author": "Deephaven Data Labs LLC",
+  "license": "SEE LICENSE IN LICENSE.md",
+  "type": "module",
+  "private": false,
+  "types": "types/index.d.ts",
+  "files": [
+    "types"
+  ],
+  "sideEffects": false,
+  "dependencies": {
+    "@deephaven/jsapi-types": "^1.0.0-dev0.34.3"
+  }
+}
diff --git a/packages/enterprise-jsapi-types/tsconfig.json b/packages/enterprise-jsapi-types/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "types",
+    "noEmit": true,
+    "skipLibCheck": false
+  },
+  "include": ["types/**/*.ts"],
+  "exclude": ["node_modules"]
+}
diff --git a/...n-enterprise/jsapi-types/CommonTypes.d.ts → ...rprise-jsapi-types/types/CommonTypes.d.ts b/...n-enterprise/jsapi-types/CommonTypes.d.ts → ...rprise-jsapi-types/types/CommonTypes.d.ts
diff --git a/...eephaven-enterprise/jsapi-types/Iris.d.ts → ...es/enterprise-jsapi-types/types/Iris.d.ts b/...eephaven-enterprise/jsapi-types/Iris.d.ts → ...es/enterprise-jsapi-types/types/Iris.d.ts
diff --git a/...ephaven-enterprise/jsapi-types/index.d.ts → ...s/enterprise-jsapi-types/types/index.d.ts b/...ephaven-enterprise/jsapi-types/index.d.ts → ...s/enterprise-jsapi-types/types/index.d.ts
diff --git a/.../jsapi-types/parameterizedQueryTypes.d.ts → ...-types/types/parameterizedQueryTypes.d.ts b/.../jsapi-types/parameterizedQueryTypes.d.ts → ...-types/types/parameterizedQueryTypes.d.ts
diff --git a/packages/require-jsapi/package.json b/packages/require-jsapi/package.json
@@ -15,5 +15,8 @@
   "sideEffects": false,
   "scripts": {
     "build": "tsc --build"
+  },
+  "dependencies": {
+    "@deephaven-enterprise/jsapi-types": "file:../enterprise-jsapi-types"
   }
 }
diff --git a/packages/require-jsapi/src/dhe.ts b/packages/require-jsapi/src/dhe.ts
@@ -1,10 +1,11 @@
-import { hasStatusCode } from './serverUtils';
+import { downloadFromURL, hasStatusCode } from './serverUtils';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import type {
   EnterpriseDhType as DheType,
   EnterpriseClient,
 } from '@deephaven-enterprise/jsapi-types';
+import { polyfillDh } from './polyfill';
 
 /**
  * Check if a given server is running by checking if the `irisapi/irisapi.nocache.js`
@@ -39,9 +40,12 @@ export async function createDheClient(
   });
 }
 
-export async function initDheApi(serverUrl: URL): Promise<DheType> {
+export async function initDheApi(
+  serverUrl: URL,
+  storageDir: string
+): Promise<DheType> {
   polyfillDh();
-  return getDhe(serverUrl, true);
+  return getDhe(serverUrl, true, storageDir);
 }
 
 declare global {
@@ -50,10 +54,10 @@ declare global {
 
 export async function getDhe(
   serverUrl: URL,
-  download: boolean
+  download: boolean,
+  storageDir: string
 ): Promise<DheType> {
-  const tmpDir = getTempDir(false, urlToDirectoryName(serverUrl));
-  const dheFilePath = path.join(tmpDir, 'irisapi.nocache.js');
+  const dheFilePath = path.join(storageDir, 'irisapi.nocache.js');
 
   if (download) {
     const dhe = await downloadFromURL(

diff --git a/src/controllers/ExtensionController.ts b/src/controllers/ExtensionController.ts
@@ -26,6 +26,7 @@ import {
   Logger,
   OutputChannelWithHistory,
   Toaster,
+  urlToDirectoryName,
 } from '../util';
 import {
   RunCommandCodeLensProvider,
@@ -60,7 +61,7 @@ import { ServerConnectionTreeDragAndDropController } from './ServerConnectionTre
 import { ConnectionController } from './ConnectionController';
 import { PipServerController } from './PipServerController';
 import { PanelController } from './PanelController';
-import { initDheApi } from '../dh/dhe';
+import { initDheApi } from '@deephaven/require-jsapi';
 
 const logger = new Logger('ExtensionController');
 
@@ -268,7 +269,9 @@ export class ExtensionController implements Disposable {
       this._toaster
     );
 
-    this._dheJsApiCache = new CacheByUrlService(initDheApi);
+    this._dheJsApiCache = new CacheByUrlService(url =>
+      initDheApi(url, getTempDir({ subDirectory: urlToDirectoryName(url) }))
+    );
     this._context.subscriptions.push(this._dheJsApiCache);
 
     this._serverManager = new ServerManager(