test: use vi.waitFor

Author: mmkal

packages/typegen/test/types.test.ts

@@ -55,7 +55,7 @@ test('types are correct', async () => {
 
   expect(logger.warn).toHaveBeenCalledTimes(1)
   // todo: fix this. I don't think we should be logging an error for a valid query that can't be typegen'd.
-  expect(logger.warn.mock.calls[0][0]).toMatchInlineSnapshot(`
+  expect(logger.warn.mock.calls[0][0].replaceAll(/\n\s+\n/g, '\n\n')).toMatchInlineSnapshot(`
     "Error: ./test/types.test.ts.ignoreme.copy.ts:16 [!] Query is not typeable.
       Caused by: Error: Walking AST failed for 
           create table types_test_table(foo int primary key, bar text);

packages/typegen/test/watch.test.ts

@@ -2,7 +2,7 @@ import * as fs from 'fs'
 import * as fsSyncer from 'fs-syncer'
 import * as path from 'path'
 
-import {test as _test, beforeEach, expect, vi as jest} from 'vitest'
+import {test as _test, beforeEach, expect, vi as jest, vi} from 'vitest'
 
 import * as typegen from '../src'
 import {getPureHelper as getHelper} from './helper'
@@ -37,6 +37,10 @@ test(
 
     const {watch} = await typegen.generate(typegenOptions(syncer.baseDir))
 
+    await vi.waitFor(() => {
+      expect(syncer.yaml()).toContain('// Generated by @pgkit/typegen')
+    })
+
     expect(syncer.yaml()).toMatchInlineSnapshot(`
       "---
       file1.ts: |-
@@ -176,26 +180,12 @@ test(
   {retry: 3},
 )
 
-const waitForLog = async (match: RegExp, timeoutMs = 3000) => {
-  return new Promise<void>((resolve, reject) => {
-    const start = Date.now()
-    const end = start + timeoutMs
-    const check = () => {
+const waitForLog = async (match: RegExp) => {
+  await vi.waitFor(
+    () => {
       const jsonLogs = JSON.stringify(logger.info.mock.calls, null, 2)
-      if (match.test(jsonLogs)) {
-        resolve()
-      } else if (Date.now() > end) {
-        reject(
-          new Error(
-            `Logs matching /${match.source}/ not found after ${timeoutMs}ms. Calls: ${JSON.stringify(logger.info.mock.calls, null, 2)}`,
-            {cause: logger.info.mock.calls},
-          ),
-        )
-      } else {
-        setTimeout(check, 20)
-      }
-    }
-
-    check()
-  })
+      expect(jsonLogs).toMatch(match)
+    },
+    {timeout: 3000},
+  )
 }