fixup: update imports

addaleax · addaleax · commit 1e06dfad5722 · 2025-11-24T15:50:57.000+01:00
diff --git a/packages/arg-parser/src/arg-mapper.spec.ts b/packages/arg-parser/src/arg-mapper.spec.ts
@@ -1,5 +1,6 @@
 import type { CliOptions, ConnectionInfo } from './';
-import chai, { expect } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import sinonChai from 'sinon-chai';
 import { mapCliToDriver } from './arg-mapper';
 import type { DevtoolsConnectOptions } from '@mongodb-js/devtools-connect';
diff --git a/packages/async-rewriter2/src/async-writer-babel.spec.ts b/packages/async-rewriter2/src/async-writer-babel.spec.ts
@@ -4,7 +4,8 @@ import path from 'path';
 import { promisify } from 'util';
 import vm from 'vm';
 import sinon from 'sinon';
-import chai, { expect } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import sinonChai from 'sinon-chai';
 chai.use(sinonChai);
 const execFile = promisify(childProcess.execFile);
diff --git a/packages/browser-repl/testing/chai.ts b/packages/browser-repl/testing/chai.ts
@@ -1,4 +1,5 @@
-import chai, { expect } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import sinonChai from 'sinon-chai';
 chai.use(sinonChai);
 
diff --git a/packages/browser-runtime-core/src/open-context-runtime.spec.ts b/packages/browser-runtime-core/src/open-context-runtime.spec.ts
@@ -4,7 +4,8 @@ import type { InterpreterEnvironment } from './';
 import { OpenContextRuntime } from './';
 import type { MongoshBus } from '@mongosh/types';
 import type { ServiceProvider } from '@mongosh/service-provider-core';
-import chai, { expect } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import sinonChai from 'sinon-chai';
 import type { StubbedInstance } from 'ts-sinon';
 import { stubInterface } from 'ts-sinon';
diff --git a/packages/browser-runtime-electron/src/electron-runtime.spec.ts b/packages/browser-runtime-electron/src/electron-runtime.spec.ts
@@ -1,6 +1,6 @@
 import type { SinonStubbedInstance } from 'sinon';
 import sinon from 'sinon';
-import chai from 'chai';
+import * as chai from 'chai';
 import sinonChai from 'sinon-chai';
 chai.use(sinonChai);
 const { expect } = chai;
diff --git a/packages/build/src/homebrew/generate-formula.spec.ts b/packages/build/src/homebrew/generate-formula.spec.ts
@@ -1,9 +1,11 @@
-import chai, { expect } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import sinon from 'sinon';
 import type { GithubRepo } from '@mongodb-js/devtools-github-repo';
 import { generateUpdatedFormula } from './generate-formula';
+import sinonChai from 'sinon-chai';
 
-chai.use(require('sinon-chai'));
+chai.use(sinonChai);
 
 const VALID_FORMULA = `require "language/node"
 
diff --git a/packages/build/src/homebrew/publish-to-homebrew.spec.ts b/packages/build/src/homebrew/publish-to-homebrew.spec.ts
@@ -1,10 +1,12 @@
-import chai, { expect } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import sinon from 'sinon';
 import type { GithubRepo } from '@mongodb-js/devtools-github-repo';
 import type { HomebrewPublisherConfig } from './publish-to-homebrew';
 import { HomebrewPublisher } from './publish-to-homebrew';
+import sinonChai from 'sinon-chai';
 
-chai.use(require('sinon-chai'));
+chai.use(sinonChai);
 
 describe('HomebrewPublisher', function () {
   let homebrewCore: GithubRepo;
diff --git a/packages/build/src/homebrew/update-homebrew-fork.spec.ts b/packages/build/src/homebrew/update-homebrew-fork.spec.ts
@@ -1,9 +1,11 @@
-import chai, { expect } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import sinon from 'sinon';
 import { GithubRepo } from '@mongodb-js/devtools-github-repo';
 import { updateHomebrewFork } from './update-homebrew-fork';
+import sinonChai from 'sinon-chai';
 
-chai.use(require('sinon-chai'));
+chai.use(sinonChai);
 
 describe('Homebrew update-homebrew-fork', function () {
   let getFileContent: sinon.SinonStub;
diff --git a/packages/build/src/publish-mongosh.spec.ts b/packages/build/src/publish-mongosh.spec.ts
@@ -1,4 +1,5 @@
-import chai, { expect } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import sinon from 'sinon';
 import { Barque } from './barque';
 import { type Config } from './config';
@@ -7,8 +8,9 @@ import { HomebrewPublisher } from './homebrew';
 import { PackageBumper, PackagePublisher } from './npm-packages';
 import { MongoshPublisher } from './publish-mongosh';
 import { dummyConfig } from '../test/helpers';
+import sinonChai from 'sinon-chai';
 
-chai.use(require('sinon-chai'));
+chai.use(sinonChai);
 
 function createStubRepo(overrides?: any): GithubRepo {
   return sinon.createStubInstance(
diff --git a/packages/build/src/run-draft.spec.ts b/packages/build/src/run-draft.spec.ts
@@ -1,4 +1,5 @@
-import chai, { expect } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import sinon from 'sinon';
 import type { Config } from './config';
 import { ALL_PACKAGE_VARIANTS } from './config';
@@ -12,8 +13,9 @@ import {
 } from './run-draft';
 import { dummyConfig } from '../test/helpers';
 import { PackageBumper } from './npm-packages';
+import sinonChai from 'sinon-chai';
 
-chai.use(require('sinon-chai'));
+chai.use(sinonChai);
 
 function createStubRepo(overrides?: any): GithubRepo {
   return sinon.createStubInstance(
diff --git a/packages/build/src/run-upload.spec.ts b/packages/build/src/run-upload.spec.ts
@@ -1,4 +1,5 @@
-import chai, { expect } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import sinon from 'sinon';
 import type { Config } from './config';
 import type { uploadArtifactToEvergreen } from './evergreen';
@@ -7,8 +8,9 @@ import { runUpload } from './run-upload';
 import { dummyConfig } from '../test/helpers';
 import type { promises as fs } from 'fs';
 import path from 'path';
+import sinonChai from 'sinon-chai';
 
-chai.use(require('sinon-chai'));
+chai.use(sinonChai);
 
 const normalizePathToCurrentOS = (p: string) => path.join(p);
 
diff --git a/packages/cli-repl/src/async-repl.spec.ts b/packages/cli-repl/src/async-repl.spec.ts
@@ -6,7 +6,8 @@ import type { Readable, Writable } from 'stream';
 import { PassThrough } from 'stream';
 import { promisify, inspect } from 'util';
 import { once } from 'events';
-import chai, { expect } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 import { tick } from '../test/repl-helpers';
diff --git a/packages/cli-repl/src/config-directory.spec.ts b/packages/cli-repl/src/config-directory.spec.ts
@@ -1,7 +1,8 @@
 import { ConfigManager, ShellHomeDirectory } from './config-directory';
 import path from 'path';
 import { promises as fs } from 'fs';
-import chai, { expect } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 import { EJSON } from 'bson';
diff --git a/packages/cli-repl/test/repl-helpers.ts b/packages/cli-repl/test/repl-helpers.ts
@@ -2,7 +2,8 @@ import { promises as fs } from 'fs';
 import { promisify } from 'util';
 import path from 'path';
 import { once } from 'events';
-import chai, { expect } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 import chaiAsPromised from 'chai-as-promised';
diff --git a/packages/e2e-tests/test/repl-helpers.ts b/packages/e2e-tests/test/repl-helpers.ts
@@ -2,7 +2,7 @@ import { promises as fs } from 'fs';
 import { promisify } from 'util';
 import path from 'path';
 import rimraf from 'rimraf';
-import chai from 'chai';
+import * as chai from 'chai';
 import sinonChai from 'sinon-chai';
 import chaiAsPromised from 'chai-as-promised';
 import type { MongodSetup } from '../../../testing/integration-testing-hooks';
diff --git a/packages/editor/src/editor.spec.ts b/packages/editor/src/editor.spec.ts
@@ -1,5 +1,6 @@
 import * as bson from 'bson';
-import chai, { expect } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import type { Duplex } from 'stream';
 import { PassThrough } from 'stream';
 import Nanobus from 'nanobus';
diff --git a/packages/node-runtime-worker-thread/src/index.spec.ts b/packages/node-runtime-worker-thread/src/index.spec.ts
@@ -1,4 +1,5 @@
-import chai, { expect } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 import type { MongoshBus } from '@mongosh/types';
diff --git a/packages/node-runtime-worker-thread/src/worker-runtime.spec.ts b/packages/node-runtime-worker-thread/src/worker-runtime.spec.ts
@@ -1,7 +1,8 @@
 import path from 'path';
 import { once } from 'events';
 import Worker from 'web-worker';
-import chai, { expect } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import sinonChai from 'sinon-chai';
 import sinon from 'sinon';
 import { EJSON, ObjectId } from 'bson';
diff --git a/packages/service-provider-node-driver/src/node-driver-service-provider.spec.ts b/packages/service-provider-node-driver/src/node-driver-service-provider.spec.ts
@@ -1,5 +1,6 @@
 import { CommonErrors } from '@mongosh/errors';
-import chai, { expect } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import type { ClientSession, SearchIndexDescription } from 'mongodb';
 import { Collection, Db, MongoClient } from 'mongodb';
 import sinonChai from 'sinon-chai';
diff --git a/packages/shell-api/src/bulk.spec.ts b/packages/shell-api/src/bulk.spec.ts
@@ -5,7 +5,8 @@ import type {
 } from '@mongosh/service-provider-core';
 import * as bson from 'bson';
 import { fail } from 'assert';
-import chai, { expect } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import sinonChai from 'sinon-chai';
 import type { EventEmitter } from 'events';
 import type { StubbedInstance } from 'ts-sinon';
diff --git a/packages/shell-api/src/collection.spec.ts b/packages/shell-api/src/collection.spec.ts
@@ -34,10 +34,9 @@ import {
   MongoshRuntimeError,
 } from '@mongosh/errors';
 import type { StringKey } from './helpers';
-
-const sinonChai = require('sinon-chai'); // weird with import
-
+import sinonChai from 'sinon-chai';
 use(sinonChai);
+
 describe('Collection', function () {
   describe('help', function () {
     const apiClass = new Collection({} as any, {} as any, 'name');
diff --git a/packages/shell-api/src/cursor.spec.ts b/packages/shell-api/src/cursor.spec.ts
@@ -11,7 +11,7 @@ import {
   ALL_API_VERSIONS,
   ServerVersions,
 } from './enums';
-import chai from 'chai';
+import * as chai from 'chai';
 import sinonChai from 'sinon-chai';
 import sinon from 'sinon';
 import type { StubbedInstance } from 'ts-sinon';
diff --git a/packages/shell-api/src/database.spec.ts b/packages/shell-api/src/database.spec.ts
@@ -1,4 +1,5 @@
-import chai, { expect } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import sinonChai from 'sinon-chai';
 import sinon from 'sinon';
 import type { StubbedInstance } from 'ts-sinon';
diff --git a/packages/shell-api/src/helpers.spec.ts b/packages/shell-api/src/helpers.spec.ts
@@ -17,7 +17,8 @@ import { NodeDriverServiceProvider } from '../../service-provider-node-driver';
 import { startSharedTestServer } from '../../../testing/integration-testing-hooks';
 import { makeFakeConfigDatabase } from '../test/shard-test-fake-data';
 import sinon from 'ts-sinon';
-import chai, { expect } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import { EventEmitter } from 'events';
 import sinonChai from 'sinon-chai';
 import { stub } from 'sinon';
diff --git a/packages/shell-api/src/replica-set.spec.ts b/packages/shell-api/src/replica-set.spec.ts
@@ -9,7 +9,8 @@ import type {
   ServiceProvider,
 } from '@mongosh/service-provider-core';
 import * as bson from 'bson';
-import chai, { expect } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import { EventEmitter } from 'events';
 import semver from 'semver';
 import sinonChai from 'sinon-chai';
diff --git a/packages/shell-bson/src/shell-bson.spec.ts b/packages/shell-bson/src/shell-bson.spec.ts
@@ -4,7 +4,8 @@ import {
   serialize as bsonSerialize,
   deserialize as bsonDeserialize,
 } from 'bson';
-import chai, { expect } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import sinonChai from 'sinon-chai';
 import sinon from 'sinon';
 import type { BSON, ShellBson } from './';
diff --git a/packages/shell-evaluator/src/shell-evaluator.spec.ts b/packages/shell-evaluator/src/shell-evaluator.spec.ts
@@ -1,11 +1,12 @@
-import { expect, use } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import sinon from 'sinon';
-const sinonChai = require('sinon-chai'); // weird with import
-use(sinonChai);
-
+import sinonChai from 'sinon-chai';
 import ShellEvaluator from './index';
 import { EventEmitter } from 'events';
 
+chai.use(sinonChai);
+
 describe('ShellEvaluator', function () {
   let shellEvaluator: ShellEvaluator;
   let busMock: EventEmitter;
diff --git a/packages/snippet-manager/src/snippet-manager.spec.ts b/packages/snippet-manager/src/snippet-manager.spec.ts
@@ -1,7 +1,8 @@
 import type { EvaluationListener } from '@mongosh/shell-api';
 import { signatures } from '@mongosh/shell-api';
 import { SnippetManager } from './snippet-manager';
-import chai, { expect } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import sinonChai from 'sinon-chai';
 import sinon from 'sinon';
 import type { StubbedInstance } from 'ts-sinon';
