chore: use sinon from the sinon package where possible, not ts-sinon MONGOSH-1501 (#1579)

lerouxb · web-flow · commit 08eb04f0b762 · 2023-08-17T12:16:09.000+01:00
* replace all simple usage of ts-sinon with sinon * use StubbedInstance type from sinon * Revert "use StubbedInstance type from sinon" This reverts commit 4613628. * don't import sinon from ts-sinon
diff --git a/packages/async-rewriter2/.depcheckrc b/packages/async-rewriter2/.depcheckrc
@@ -5,6 +5,7 @@ ignores:
  - '@typescript-eslint/parser'
  - '@typescript-eslint/eslint-plugin'
  - chai
+ - sinon
  - sinon-chai
  - ts-sinon
  - eslint-plugin-mocha
diff --git a/packages/async-rewriter2/src/async-writer-babel.spec.ts b/packages/async-rewriter2/src/async-writer-babel.spec.ts
@@ -3,7 +3,7 @@ import childProcess from 'child_process';
 import path from 'path';
 import { promisify } from 'util';
 import vm from 'vm';
-import sinon from 'ts-sinon';
+import sinon from 'sinon';
 import chai, { expect } from 'chai';
 import sinonChai from 'sinon-chai';
 chai.use(sinonChai);
diff --git a/packages/browser-runtime-core/.depcheckrc b/packages/browser-runtime-core/.depcheckrc
@@ -5,6 +5,7 @@ ignores:
  - '@typescript-eslint/parser'
  - '@typescript-eslint/eslint-plugin'
  - chai
+ - sinon
  - sinon-chai
  - ts-sinon
  - eslint-plugin-mocha
diff --git a/packages/build/.depcheckrc b/packages/build/.depcheckrc
@@ -5,6 +5,7 @@ ignores:
  - '@typescript-eslint/parser'
  - '@typescript-eslint/eslint-plugin'
  - chai
+ - sinon
  - ts-sinon
  - sinon
  - eslint-plugin-mocha
diff --git a/packages/build/src/download-center/artifacts.spec.ts b/packages/build/src/download-center/artifacts.spec.ts
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import sinon from 'ts-sinon';
+import sinon from 'sinon';
 import { uploadArtifactToDownloadCenter } from './artifacts';
 
 describe('DownloadCenter artifacts', function () {
diff --git a/packages/build/src/download-center/config.spec.ts b/packages/build/src/download-center/config.spec.ts
@@ -1,7 +1,7 @@
 import type { DownloadCenterConfig } from '@mongodb-js/dl-center/dist/download-center-config';
 import type { PackageInformationProvider } from '../packaging';
 import { expect } from 'chai';
-import sinon from 'ts-sinon';
+import sinon from 'sinon';
 import type { PackageVariant } from '../config';
 import {
   createVersionConfig,
diff --git a/packages/build/src/helpers/with-retries.spec.ts b/packages/build/src/helpers/with-retries.spec.ts
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import sinon from 'ts-sinon';
+import sinon from 'sinon';
 import { withRetries } from './';
 
 describe('withRetries', function () {
diff --git a/packages/build/src/homebrew/generate-formula.spec.ts b/packages/build/src/homebrew/generate-formula.spec.ts
@@ -1,5 +1,5 @@
 import chai, { expect } from 'chai';
-import sinon from 'ts-sinon';
+import sinon from 'sinon';
 import type { GithubRepo } from '@mongodb-js/devtools-github-repo';
 import { generateUpdatedFormula } from './generate-formula';
 
diff --git a/packages/build/src/homebrew/publish-to-homebrew.spec.ts b/packages/build/src/homebrew/publish-to-homebrew.spec.ts
@@ -1,5 +1,5 @@
 import chai, { expect } from 'chai';
-import sinon from 'ts-sinon';
+import sinon from 'sinon';
 import type { GithubRepo } from '@mongodb-js/devtools-github-repo';
 import { publishToHomebrew } from './publish-to-homebrew';
 
diff --git a/packages/build/src/homebrew/update-homebrew-fork.spec.ts b/packages/build/src/homebrew/update-homebrew-fork.spec.ts
@@ -1,5 +1,5 @@
 import chai, { expect } from 'chai';
-import sinon from 'ts-sinon';
+import sinon from 'sinon';
 import { GithubRepo } from '@mongodb-js/devtools-github-repo';
 import { updateHomebrewFork } from './update-homebrew-fork';
 
diff --git a/packages/build/src/packaging/package/zip.spec.ts b/packages/build/src/packaging/package/zip.spec.ts
@@ -2,7 +2,7 @@ import { expect } from 'chai';
 import { spawnSync } from 'child_process';
 import { promises as fs } from 'fs';
 import * as path from 'path';
-import sinon from 'ts-sinon';
+import sinon from 'sinon';
 import { withTempPackageEach } from '../../../test/helpers';
 import { createPackage } from './create-package';
 import { createZipPackage } from './zip';
diff --git a/packages/build/src/run-draft.spec.ts b/packages/build/src/run-draft.spec.ts
@@ -1,5 +1,5 @@
 import chai, { expect } from 'chai';
-import sinon from 'ts-sinon';
+import sinon from 'sinon';
 import type { Config } from './config';
 import { ALL_PACKAGE_VARIANTS } from './config';
 import type { uploadArtifactToDownloadCenter as uploadArtifactToDownloadCenterFn } from './download-center';
diff --git a/packages/build/src/run-publish.spec.ts b/packages/build/src/run-publish.spec.ts
@@ -1,5 +1,5 @@
 import chai, { expect } from 'chai';
-import sinon from 'ts-sinon';
+import sinon from 'sinon';
 import type { writeBuildInfo as writeBuildInfoType } from './build-info';
 import { Barque } from './barque';
 import type {
diff --git a/packages/build/src/run-upload.spec.ts b/packages/build/src/run-upload.spec.ts
@@ -1,5 +1,5 @@
 import chai, { expect } from 'chai';
-import sinon from 'ts-sinon';
+import sinon from 'sinon';
 import type { Config } from './config';
 import type { uploadArtifactToEvergreen } from './evergreen';
 import type { PackageFile } from './packaging';
diff --git a/packages/cli-repl/.depcheckrc b/packages/cli-repl/.depcheckrc
@@ -5,8 +5,8 @@ ignores:
  - '@typescript-eslint/parser'
  - '@typescript-eslint/eslint-plugin'
  - chai
- - sinon-chai
  - sinon
+ - sinon-chai
  - ts-sinon
  - mocha
  - eslint-plugin-mocha
diff --git a/packages/cli-repl/src/async-repl.spec.ts b/packages/cli-repl/src/async-repl.spec.ts
@@ -7,7 +7,7 @@ import { PassThrough } from 'stream';
 import { promisify, inspect } from 'util';
 import { once } from 'events';
 import chai, { expect } from 'chai';
-import sinon from 'ts-sinon';
+import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 import { tick } from '../test/repl-helpers';
 chai.use(sinonChai);
diff --git a/packages/cli-repl/src/config-directory.spec.ts b/packages/cli-repl/src/config-directory.spec.ts
@@ -4,7 +4,7 @@ import path from 'path';
 import { promises as fs } from 'fs';
 import { promisify } from 'util';
 import chai, { expect } from 'chai';
-import sinon from 'ts-sinon';
+import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 import { bson } from '@mongosh/service-provider-core';
 const { EJSON } = bson;
diff --git a/packages/cli-repl/test/repl-helpers.ts b/packages/cli-repl/test/repl-helpers.ts
@@ -4,7 +4,7 @@ import path from 'path';
 import { once } from 'events';
 import rimraf from 'rimraf';
 import chai, { expect } from 'chai';
-import sinon from 'ts-sinon';
+import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 import chaiAsPromised from 'chai-as-promised';
 import type { MongoshBus, MongoshBusEventsMap } from '@mongosh/types';
diff --git a/packages/editor/.depcheckrc b/packages/editor/.depcheckrc
@@ -5,8 +5,8 @@ ignores:
  - '@typescript-eslint/parser'
  - '@typescript-eslint/eslint-plugin'
  - chai
- - sinon-chai
  - sinon
+ - sinon-chai
  - ts-sinon
  - eslint-plugin-mocha
  - eslint-config-mongodb-js
diff --git a/packages/editor/src/editor.spec.ts b/packages/editor/src/editor.spec.ts
@@ -7,7 +7,7 @@ import path from 'path';
 import { promises as fs } from 'fs';
 import { promisify } from 'util';
 import rimraf from 'rimraf';
-import sinon from 'ts-sinon';
+import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 
 import type { EditorOptions } from './editor';
diff --git a/packages/errors/.depcheckrc b/packages/errors/.depcheckrc
@@ -5,8 +5,8 @@ ignores:
  - '@typescript-eslint/parser'
  - '@typescript-eslint/eslint-plugin'
  - chai
- - sinon-chai
  - sinon
+ - sinon-chai
  - ts-sinon
  - eslint-plugin-mocha
  - eslint-config-mongodb-js
diff --git a/packages/service-provider-server/.depcheckrc b/packages/service-provider-server/.depcheckrc
@@ -5,6 +5,7 @@ ignores:
  - '@typescript-eslint/parser'
  - '@typescript-eslint/eslint-plugin'
  - chai
+ - sinon
  - sinon-chai
  - ts-sinon
  - eslint-plugin-mocha
diff --git a/packages/shell-api/.depcheckrc b/packages/shell-api/.depcheckrc
@@ -5,6 +5,7 @@ ignores:
  - '@typescript-eslint/parser'
  - '@typescript-eslint/eslint-plugin'
  - chai
+ - sinon
  - sinon-chai
  - ts-sinon
  - eslint-plugin-mocha
diff --git a/packages/shell-api/src/aggregation-cursor.spec.ts b/packages/shell-api/src/aggregation-cursor.spec.ts
@@ -1,6 +1,7 @@
 import { expect } from 'chai';
 import type { StubbedInstance } from 'ts-sinon';
-import sinon, { stubInterface } from 'ts-sinon';
+import sinon from 'sinon';
+import { stubInterface } from 'ts-sinon';
 import { signatures, toShellResult } from './index';
 import AggregationCursor from './aggregation-cursor';
 import {
diff --git a/packages/shell-api/src/change-stream-cursor.spec.ts b/packages/shell-api/src/change-stream-cursor.spec.ts
@@ -1,6 +1,7 @@
 import { expect } from 'chai';
 import type { StubbedInstance } from 'ts-sinon';
-import sinon, { stubInterface } from 'ts-sinon';
+import sinon from 'sinon';
+import { stubInterface } from 'ts-sinon';
 import { signatures, toShellResult } from './index';
 import ChangeStreamCursor from './change-stream-cursor';
 import {
diff --git a/packages/shell-api/src/collection.spec.ts b/packages/shell-api/src/collection.spec.ts
@@ -1,6 +1,7 @@
 import { expect, use } from 'chai';
 import type { StubbedInstance } from 'ts-sinon';
-import sinon, { stubInterface } from 'ts-sinon';
+import sinon from 'sinon';
+import { stubInterface } from 'ts-sinon';
 import type { EventEmitter } from 'events';
 import { signatures, toShellResult } from './index';
 import {
diff --git a/packages/shell-api/src/cursor.spec.ts b/packages/shell-api/src/cursor.spec.ts
@@ -10,8 +10,9 @@ import {
 } from './enums';
 import chai from 'chai';
 import sinonChai from 'sinon-chai';
+import sinon from 'sinon';
 import type { StubbedInstance } from 'ts-sinon';
-import sinon, { stubInterface } from 'ts-sinon';
+import { stubInterface } from 'ts-sinon';
 import {
   CommonErrors,
   MongoshDeprecatedError,
diff --git a/packages/shell-api/src/database.spec.ts b/packages/shell-api/src/database.spec.ts
@@ -1,7 +1,8 @@
 import chai, { expect } from 'chai';
 import sinonChai from 'sinon-chai';
+import sinon from 'sinon';
 import type { StubbedInstance } from 'ts-sinon';
-import sinon, { stubInterface } from 'ts-sinon';
+import { stubInterface } from 'ts-sinon';
 import type { EventEmitter } from 'events';
 import { ALL_PLATFORMS, ALL_SERVER_VERSIONS, ALL_TOPOLOGIES } from './enums';
 import { signatures, toShellResult } from './index';
diff --git a/packages/shell-api/src/explainable-cursor.spec.ts b/packages/shell-api/src/explainable-cursor.spec.ts
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import sinon from 'ts-sinon';
+import sinon from 'sinon';
 import {
   ALL_PLATFORMS,
   ALL_SERVER_VERSIONS,
diff --git a/packages/shell-api/src/explainable.spec.ts b/packages/shell-api/src/explainable.spec.ts
@@ -1,6 +1,7 @@
 import { expect } from 'chai';
+import sinon from 'sinon';
 import type { StubbedInstance } from 'ts-sinon';
-import sinon, { stubInterface } from 'ts-sinon';
+import { stubInterface } from 'ts-sinon';
 import type { EventEmitter } from 'events';
 import { ALL_PLATFORMS, ALL_SERVER_VERSIONS, ALL_TOPOLOGIES } from './enums';
 import { signatures, toShellResult } from './index';
diff --git a/packages/shell-api/src/field-level-encryption.spec.ts b/packages/shell-api/src/field-level-encryption.spec.ts
@@ -12,8 +12,9 @@ import { EventEmitter } from 'events';
 import { promises as fs } from 'fs';
 import path from 'path';
 import { Duplex } from 'stream';
+import sinon from 'sinon';
 import type { StubbedInstance } from 'ts-sinon';
-import sinon, { stubInterface } from 'ts-sinon';
+import { stubInterface } from 'ts-sinon';
 import type Database from './database';
 import { signatures, toShellResult } from './decorators';
 import {
diff --git a/packages/shell-api/src/help.spec.ts b/packages/shell-api/src/help.spec.ts
@@ -1,4 +1,4 @@
-import sinon from 'ts-sinon';
+import sinon from 'sinon';
 import Help from './help';
 import { toShellResult } from './index';
 import { expect } from 'chai';
diff --git a/packages/shell-api/src/shard.spec.ts b/packages/shell-api/src/shard.spec.ts
@@ -1,6 +1,7 @@
 import { expect } from 'chai';
+import sinon from 'sinon';
 import type { StubbedInstance } from 'ts-sinon';
-import sinon, { stubInterface } from 'ts-sinon';
+import { stubInterface } from 'ts-sinon';
 import Shard from './shard';
 import {
   ADMIN_DB,
diff --git a/packages/shell-api/src/shell-api.spec.ts b/packages/shell-api/src/shell-api.spec.ts
@@ -9,8 +9,9 @@ import {
   ALL_TOPOLOGIES,
   ALL_API_VERSIONS,
 } from './enums';
+import sinon from 'sinon';
 import type { StubbedInstance } from 'ts-sinon';
-import sinon, { stubInterface } from 'ts-sinon';
+import { stubInterface } from 'ts-sinon';
 import Mongo from './mongo';
 import type {
   ServiceProvider,
diff --git a/packages/shell-api/src/shell-bson.spec.ts b/packages/shell-api/src/shell-bson.spec.ts
@@ -5,7 +5,7 @@ import {
   deserialize as bsonDeserialize,
 } from 'bson';
 import { expect } from 'chai';
-import sinon from 'ts-sinon';
+import sinon from 'sinon';
 import { ALL_SERVER_VERSIONS } from './enums';
 import { toShellResult } from './index';
 import constructShellBson from './shell-bson';
diff --git a/packages/shell-evaluator/.depcheckrc b/packages/shell-evaluator/.depcheckrc
@@ -5,6 +5,7 @@ ignores:
  - '@typescript-eslint/parser'
  - '@typescript-eslint/eslint-plugin'
  - chai
+ - sinon
  - sinon-chai
  - ts-sinon
  - eslint-plugin-mocha
diff --git a/packages/shell-evaluator/src/shell-evaluator.spec.ts b/packages/shell-evaluator/src/shell-evaluator.spec.ts
@@ -1,5 +1,5 @@
 import { expect, use } from 'chai';
-import sinon from 'ts-sinon';
+import sinon from 'sinon';
 const sinonChai = require('sinon-chai'); // weird with import
 use(sinonChai);
 
diff --git a/packages/snippet-manager/.depcheckrc b/packages/snippet-manager/.depcheckrc
@@ -5,6 +5,7 @@ ignores:
  - '@typescript-eslint/parser'
  - '@typescript-eslint/eslint-plugin'
  - chai
+ - sinon
  - sinon-chai
  - ts-sinon
  - eslint-plugin-mocha
diff --git a/packages/snippet-manager/src/snippet-manager.spec.ts b/packages/snippet-manager/src/snippet-manager.spec.ts
@@ -3,8 +3,9 @@ import { signatures } from '@mongosh/shell-api';
 import { SnippetManager } from './snippet-manager';
 import chai, { expect } from 'chai';
 import sinonChai from 'sinon-chai';
+import sinon from 'sinon';
 import type { StubbedInstance } from 'ts-sinon';
-import sinon, { stubInterface } from 'ts-sinon';
+import { stubInterface } from 'ts-sinon';
 import { once } from 'events';
 import http from 'http';
 import zlib from 'zlib';
diff --git a/packages/types/.depcheckrc b/packages/types/.depcheckrc
@@ -5,6 +5,7 @@ ignores:
  - '@typescript-eslint/parser'
  - '@typescript-eslint/eslint-plugin'
  - chai
+ - sinon
  - sinon-chai
  - ts-sinon
  - eslint-plugin-mocha
