fix: fixing vitest import for dbTest/daoTest

Author: kirillgroshkov

src/testing/daoTest.ts

@@ -1,12 +1,11 @@
 import { Readable } from 'node:stream'
-import { _deepCopy, _omit, _pick, _sortBy, localTime } from '@naturalcycles/js-lib'
+import { _deepCopy, _filterObject, _omit, _pick, _sortBy, localTime } from '@naturalcycles/js-lib'
 import { _pipeline } from '@naturalcycles/nodejs-lib'
-import { expect, test } from 'vitest'
 import { CommonDaoLogLevel, DBQuery } from '..'
 import { CommonDB } from '../common.db'
 import { CommonDao } from '../commondao/common.dao'
 import { TestItemBM } from '.'
-import { CommonDBImplementationQuirks, expectMatch } from './dbTest'
+import { CommonDBImplementationQuirks } from './dbTest'
 import {
   createTestItemBM,
   createTestItemsBM,
@@ -15,7 +14,13 @@ import {
   testItemBMSchema,
 } from './test.model'
 
-export function runCommonDaoTest(db: CommonDB, quirks: CommonDBImplementationQuirks = {}): void {
+export async function runCommonDaoTest(
+  db: CommonDB,
+  quirks: CommonDBImplementationQuirks = {},
+): Promise<void> {
+  // this is because vitest cannot be "required" from cjs
+  const { test, expect } = await import('vitest')
+
   const { support } = db
   const dao = new CommonDao({
     table: TEST_TABLE,
@@ -359,4 +364,21 @@ export function runCommonDaoTest(db: CommonDB, quirks: CommonDBImplementationQui
       })
     }
   }
+
+  function expectMatch(expected: any[], actual: any[], quirks: CommonDBImplementationQuirks): void {
+    // const expectedSorted = sortObjectDeep(expected)
+    // const actualSorted = sortObjectDeep(actual)
+
+    if (quirks.allowBooleansAsUndefined) {
+      expected = expected.map(r => {
+        return typeof r !== 'object' ? r : _filterObject(r, (_k, v) => v !== false)
+      })
+    }
+
+    if (quirks.allowExtraPropertiesInResponse) {
+      expect(actual).toMatchObject(expected)
+    } else {
+      expect(actual).toEqual(expected)
+    }
+  }
 }

src/testing/dbTest.ts

@@ -1,5 +1,4 @@
 import { _deepFreeze, _filterObject, _pick, _sortBy, localTime, pMap } from '@naturalcycles/js-lib'
-import { expect, test } from 'vitest'
 import { CommonDB, CommonDBType } from '../common.db'
 import { DBQuery } from '../query/dbQuery'
 import {
@@ -25,7 +24,13 @@ export interface CommonDBImplementationQuirks {
   allowBooleansAsUndefined?: boolean
 }
 
-export function runCommonDBTest(db: CommonDB, quirks: CommonDBImplementationQuirks = {}): void {
+export async function runCommonDBTest(
+  db: CommonDB,
+  quirks: CommonDBImplementationQuirks = {},
+): Promise<void> {
+  // this is because vitest cannot be "required" from cjs
+  const { test, expect } = await import('vitest')
+
   const { support } = db
   const items = createTestItemsDBM(3)
   _deepFreeze(items)
@@ -380,25 +385,21 @@ export function runCommonDBTest(db: CommonDB, quirks: CommonDBImplementationQuir
       await db.deleteByQuery(queryAll())
     })
   }
-}
 
-export function expectMatch(
-  expected: any[],
-  actual: any[],
-  quirks: CommonDBImplementationQuirks,
-): void {
-  // const expectedSorted = sortObjectDeep(expected)
-  // const actualSorted = sortObjectDeep(actual)
-
-  if (quirks.allowBooleansAsUndefined) {
-    expected = expected.map(r => {
-      return typeof r !== 'object' ? r : _filterObject(r, (_k, v) => v !== false)
-    })
-  }
+  function expectMatch(expected: any[], actual: any[], quirks: CommonDBImplementationQuirks): void {
+    // const expectedSorted = sortObjectDeep(expected)
+    // const actualSorted = sortObjectDeep(actual)
 
-  if (quirks.allowExtraPropertiesInResponse) {
-    expect(actual).toMatchObject(expected)
-  } else {
-    expect(actual).toEqual(expected)
+    if (quirks.allowBooleansAsUndefined) {
+      expected = expected.map(r => {
+        return typeof r !== 'object' ? r : _filterObject(r, (_k, v) => v !== false)
+      })
+    }
+
+    if (quirks.allowExtraPropertiesInResponse) {
+      expect(actual).toMatchObject(expected)
+    } else {
+      expect(actual).toEqual(expected)
+    }
   }
 }

src/testing/keyValueDBTest.ts

@@ -1,5 +1,4 @@
 import { _range, _sortBy, KeyValueTuple } from '@naturalcycles/js-lib'
-import { afterAll, beforeAll, expect, test } from 'vitest'
 import { CommonKeyValueDB } from '../kv/commonKeyValueDB'
 import { TEST_TABLE } from './test.model'
 
@@ -10,7 +9,9 @@ const testEntries: KeyValueTuple<string, Buffer>[] = testIds.map(id => [
   Buffer.from(`${id}value`),
 ])
 
-export function runCommonKeyValueDBTest(db: CommonKeyValueDB): void {
+export async function runCommonKeyValueDBTest(db: CommonKeyValueDB): Promise<void> {
+  const { afterAll, beforeAll, expect, test } = await import('vitest')
+
   beforeAll(async () => {
     // Tests in this suite are not isolated,
     // and failing tests can leave the DB in an unexpected state for other tests,

src/testing/keyValueDaoTest.ts

@@ -1,5 +1,4 @@
 import { _sortBy } from '@naturalcycles/js-lib'
-import { afterAll, beforeAll, expect, test } from 'vitest'
 import { CommonKeyValueDao } from '../kv/commonKeyValueDao'
 import { CommonKeyValueDB, KeyValueDBTuple } from '../kv/commonKeyValueDB'
 import { createTestItemsBM, TEST_TABLE } from './test.model'
@@ -8,7 +7,9 @@ const testItems = createTestItemsBM(4)
 const testIds = testItems.map(e => e.id)
 const testEntries: KeyValueDBTuple[] = testItems.map(e => [e.id, Buffer.from(`${e.id}value`)])
 
-export function runCommonKeyValueDaoTest(db: CommonKeyValueDB): void {
+export async function runCommonKeyValueDaoTest(db: CommonKeyValueDB): Promise<void> {
+  const { afterAll, beforeAll, expect, test } = await import('vitest')
+
   const dao = new CommonKeyValueDao({
     db,
     table: TEST_TABLE,