Use stricter TS compiler settings for modules (#38)

fjakobs · web-flow · commit 4b64b29dc4e9 · 2022-07-29T15:12:17.000+02:00
diff --git a/packages/databricks-sdk-js/package.json b/packages/databricks-sdk-js/package.json
@@ -42,6 +42,7 @@
         "tmp-promise": "^3.0.3",
         "ts-loader": "^9.3.1",
         "ts-mocha": "^10.0.0",
+        "ts-node": "^10.9.1",
         "typescript": "^4.7.4",
         "uuid": "^8.3.2"
     }
diff --git a/packages/databricks-sdk-js/src/apis/executionContext.integ.ts b/packages/databricks-sdk-js/src/apis/executionContext.integ.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 
 import {ExecutionContextService, CommandsService} from "..";
-import * as assert from "assert";
+import assert from "assert";
 
 import {IntegrationTestSetup, sleep} from "../test/IntegrationTestSetup";
 
diff --git a/packages/databricks-sdk-js/src/apis/jobs.integ.ts b/packages/databricks-sdk-js/src/apis/jobs.integ.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 
 import {JobsService, DbfsService} from "..";
-import assert = require("assert");
+import assert from "assert";
 
 import {IntegrationTestSetup, sleep} from "../test/IntegrationTestSetup";
 
diff --git a/packages/databricks-sdk-js/src/auth/configFile.test.ts b/packages/databricks-sdk-js/src/auth/configFile.test.ts
@@ -1,11 +1,11 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 
-import assert = require("node:assert");
+import assert from "node:assert";
 import {loadConfigFile, resolveConfigFilePath} from "./configFile";
 import {writeFile} from "node:fs/promises";
 import {withFile} from "tmp-promise";
 import {homedir} from "node:os";
-import path = require("node:path");
+import path from "node:path";
 
 describe(__filename, () => {
     beforeEach(() => {
diff --git a/packages/databricks-sdk-js/src/auth/configFile.ts b/packages/databricks-sdk-js/src/auth/configFile.ts
@@ -1,4 +1,4 @@
-import path = require("node:path");
+import path from "node:path";
 import {readFile, stat} from "node:fs/promises";
 import {parse} from "ini";
 import {homedir} from "node:os";
diff --git a/packages/databricks-sdk-js/src/auth/fromConfigFile.test.ts b/packages/databricks-sdk-js/src/auth/fromConfigFile.test.ts
@@ -1,4 +1,4 @@
-import assert = require("node:assert");
+import assert from "node:assert";
 import {writeFile} from "node:fs/promises";
 import {withFile} from "tmp-promise";
 import {DEFAULT_PROFILE, fromConfigFile} from "./fromConfigFile";
diff --git a/packages/databricks-sdk-js/src/auth/fromEnv.test.ts b/packages/databricks-sdk-js/src/auth/fromEnv.test.ts
@@ -1,4 +1,4 @@
-import assert = require("node:assert");
+import assert from "node:assert";
 import {CredentialsProviderError} from "./types";
 import {fromEnv} from "./fromEnv";
 
diff --git a/packages/databricks-sdk-js/src/services/Cluster.integ.ts b/packages/databricks-sdk-js/src/services/Cluster.integ.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 
 import {Cluster} from "..";
-import assert = require("assert");
+import assert from "assert";
 
 import {IntegrationTestSetup} from "../test/IntegrationTestSetup";
 
diff --git a/packages/databricks-sdk-js/src/services/Command.ts b/packages/databricks-sdk-js/src/services/Command.ts
@@ -1,4 +1,4 @@
-import EventEmitter = require("node:events");
+import EventEmitter from "node:events";
 import {CommandsService, CommandsStatusResponse} from "../apis/commands";
 import {Language} from "../apis/executionContext";
 import {ExecutionContext} from "./ExecutionContext";
diff --git a/packages/databricks-sdk-js/src/services/ExecutionContext.integ.ts b/packages/databricks-sdk-js/src/services/ExecutionContext.integ.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 
 import {ExecutionContext} from "..";
-import * as assert from "assert";
+import assert from "assert";
 
 import {IntegrationTestSetup} from "../test/IntegrationTestSetup";
 
diff --git a/packages/databricks-sdk-js/src/services/WorkflowRun.integ.ts b/packages/databricks-sdk-js/src/services/WorkflowRun.integ.ts
@@ -1,5 +1,5 @@
 import {DbfsService, Cluster, jobs, WorkflowRun, WorkspaceService} from "..";
-import * as assert from "assert";
+import assert from "assert";
 
 import {IntegrationTestSetup} from "../test/IntegrationTestSetup";
 
diff --git a/packages/databricks-sdk-js/tsconfig.json b/packages/databricks-sdk-js/tsconfig.json
@@ -3,6 +3,9 @@
         "declaration": true,
         "module": "CommonJS",
         "target": "ES6",
+        "moduleResolution": "Node",
+        "esModuleInterop": true,
+        "isolatedModules": true,
         "lib": ["ES2020"],
         "sourceMap": true,
         "rootDir": "src",
diff --git a/packages/databricks-vscode/src/cluster/ClusterListDataProvider.test.ts b/packages/databricks-vscode/src/cluster/ClusterListDataProvider.test.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 
-import * as assert from "assert";
+import assert from "assert";
 import {mock, when, instance} from "ts-mockito";
 import {ClusterModel} from "./ClusterModel";
 import {Disposable, TreeItem} from "vscode";
diff --git a/packages/databricks-vscode/src/cluster/ClusterModel.test.ts b/packages/databricks-vscode/src/cluster/ClusterModel.test.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 
-import * as assert from "assert";
+import assert from "assert";
 import {mock, when, anything, anyString, instance, verify} from "ts-mockito";
 import {ApiClient, cluster} from "@databricks/databricks-sdk";
 import {ClusterModel} from "./ClusterModel";
diff --git a/packages/databricks-vscode/src/configuration/ConfigurationDataProvider.test.ts b/packages/databricks-vscode/src/configuration/ConfigurationDataProvider.test.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 
-import * as assert from "assert";
+import assert from "assert";
 import {mock, when, instance} from "ts-mockito";
 import {Disposable} from "vscode";
 import {ConfigurationDataProvider} from "./ConfigurationDataProvider";
diff --git a/packages/databricks-vscode/src/configuration/ConnectionManager.ts b/packages/databricks-vscode/src/configuration/ConnectionManager.ts
@@ -4,7 +4,7 @@ import {
     fromConfigFile,
     ScimService,
 } from "@databricks/databricks-sdk";
-import {commands, EventEmitter, Uri, window, workspace} from "vscode";
+import {commands, EventEmitter, window, workspace} from "vscode";
 import {CliWrapper} from "../cli/CliWrapper";
 import {ProjectConfigFile} from "./ProjectConfigFile";
 import {selectProfile} from "./selectProfileWizard";
diff --git a/packages/databricks-vscode/src/configuration/ProjectConfigFile.ts b/packages/databricks-vscode/src/configuration/ProjectConfigFile.ts
@@ -1,5 +1,5 @@
-import path = require("node:path");
-import fs = require("node:fs/promises");
+import path from "node:path";
+import fs from "node:fs/promises";
 
 export interface ProjectConfig {
     profile?: string;
diff --git a/packages/databricks-vscode/src/test/e2e/configure.e2e.ts b/packages/databricks-vscode/src/test/e2e/configure.e2e.ts
@@ -1,5 +1,5 @@
-import assert = require("node:assert");
-import path = require("node:path");
+import assert from "node:assert";
+import path from "node:path";
 import * as fs from "fs/promises";
 import * as tmp from "tmp-promise";
 import {
diff --git a/packages/databricks-vscode/src/test/e2e/run_on_cluster.e2e.ts b/packages/databricks-vscode/src/test/e2e/run_on_cluster.e2e.ts
@@ -1,15 +1,9 @@
-import assert = require("node:assert");
-import path = require("node:path");
+import assert from "node:assert";
+import path from "node:path";
 import * as fs from "fs/promises";
 import * as tmp from "tmp-promise";
-import {
-    VSBrowser,
-    WebDriver,
-    ActivityBar,
-    InputBox,
-    Workbench,
-} from "vscode-extension-tester";
-import {openCommandPrompt, openFolder} from "./utils";
+import {VSBrowser, WebDriver} from "vscode-extension-tester";
+import {openFolder} from "./utils";
 
 describe("Run python on cluster", function () {
     // these will be populated by the before() function
diff --git a/packages/databricks-vscode/src/test/e2e/scripts/e2e.ts b/packages/databricks-vscode/src/test/e2e/scripts/e2e.ts
@@ -1,8 +1,8 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import {spawn} from "child_process";
-import * as assert from "assert";
-import * as fs from "fs/promises";
-import * as tmp from "tmp-promise";
+import assert from "assert";
+import fs from "fs/promises";
+import tmp from "tmp-promise";
 
 /**
  * Create a temporary Databricks config file with values taken from environment variables
diff --git a/packages/databricks-vscode/src/test/runTest.ts b/packages/databricks-vscode/src/test/runTest.ts
@@ -1,5 +1,5 @@
-import * as path from "path";
-import os = require("os");
+import path from "path";
+import os from "os";
 
 import {runTests} from "@vscode/test-electron";
 
diff --git a/packages/databricks-vscode/src/test/suite.ts b/packages/databricks-vscode/src/test/suite.ts
@@ -1,6 +1,6 @@
-import * as path from "path";
-import * as Mocha from "mocha";
-import * as glob from "glob";
+import path from "path";
+import Mocha from "mocha";
+import glob from "glob";
 
 export function run(): Promise<void> {
     // Create the mocha test
diff --git a/packages/databricks-vscode/tsconfig.json b/packages/databricks-vscode/tsconfig.json
@@ -1,7 +1,10 @@
 {
     "compilerOptions": {
-        "module": "commonjs",
-        "target": "ES2020",
+        "module": "CommonJS",
+        "target": "ES6",
+        "moduleResolution": "Node",
+        "esModuleInterop": true,
+        "isolatedModules": true,
         "lib": ["ES2020"],
         "sourceMap": true,
         "rootDir": "src",
diff --git a/yarn.lock b/yarn.lock
@@ -31,6 +31,7 @@ __metadata:
     tmp-promise: ^3.0.3
     ts-loader: ^9.3.1
     ts-mocha: ^10.0.0
+    ts-node: ^10.9.1
     typescript: ^4.7.4
     uuid: ^8.3.2
   languageName: unknown

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@`
`42`	`42`	`"tmp-promise": "^3.0.3",`
`43`	`43`	`"ts-loader": "^9.3.1",`
`44`	`44`	`"ts-mocha": "^10.0.0",`
	`45`	`+ "ts-node": "^10.9.1",`
`45`	`46`	`"typescript": "^4.7.4",`
`46`	`47`	`"uuid": "^8.3.2"`
`47`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import path = require("node:path");`
	`1`	`+import path from "node:path";`
`2`	`2`	`import {readFile, stat} from "node:fs/promises";`
`3`	`3`	`import {parse} from "ini";`
`4`	`4`	`import {homedir} from "node:os";`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import assert = require("node:assert");`
	`1`	`+import assert from "node:assert";`
`2`	`2`	`import {writeFile} from "node:fs/promises";`
`3`	`3`	`import {withFile} from "tmp-promise";`
`4`	`4`	`import {DEFAULT_PROFILE, fromConfigFile} from "./fromConfigFile";`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import EventEmitter = require("node:events");`
	`1`	`+import EventEmitter from "node:events";`
`2`	`2`	`import {CommandsService, CommandsStatusResponse} from "../apis/commands";`
`3`	`3`	`import {Language} from "../apis/executionContext";`
`4`	`4`	`import {ExecutionContext} from "./ExecutionContext";`