From eaed45d8a2f7e7d86f6a4194e52288843c8f420e Mon Sep 17 00:00:00 2001
From: Will Ernst <wernst@users.noreply.github.com>
Date: Fri, 14 Jun 2024 15:09:49 -0400
Subject: [PATCH] fixup type test and types imports

---
 packages/db/src/db-helpers.ts              | 2 +-
 packages/db/src/db-transaction.ts          | 2 +-
 packages/db/src/db.ts                      | 2 +-
 packages/db/test/typecheck/query.test-d.ts | 7 +++++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/db/src/db-helpers.ts b/packages/db/src/db-helpers.ts
index 0a3c1593..b329655c 100644
--- a/packages/db/src/db-helpers.ts
+++ b/packages/db/src/db-helpers.ts
@@ -51,7 +51,7 @@ import {
   validateIdentifier,
   convertEntityToJS,
 } from './collection-query.js';
-import { Logger } from '@triplit/types/src/logger.js';
+import { Logger } from '@triplit/types/logger';
 import { prefixVariables } from './utils.js';
 import { FetchResult } from './query/types';
 
diff --git a/packages/db/src/db-transaction.ts b/packages/db/src/db-transaction.ts
index a33c963b..c289cd29 100644
--- a/packages/db/src/db-transaction.ts
+++ b/packages/db/src/db-transaction.ts
@@ -83,7 +83,7 @@ import {
 } from './triple-store-utils.js';
 import { TripleStoreApi } from './triple-store.js';
 import { RecordType } from './data-types/record.js';
-import { Logger } from '@triplit/types/src/logger.js';
+import { Logger } from '@triplit/types/logger';
 import {
   Unalias,
   FetchResultEntityFromParts,
diff --git a/packages/db/src/db.ts b/packages/db/src/db.ts
index 2e0181f9..b9699c78 100644
--- a/packages/db/src/db.ts
+++ b/packages/db/src/db.ts
@@ -44,7 +44,7 @@ import {
 import { copyHooks, prefixVariables, triplesToObject } from './utils.js';
 import { EAV, indexToTriple, TripleRow } from './triple-store-utils.js';
 import { TripleStore } from './triple-store.js';
-import { Logger } from '@triplit/types/src/logger.js';
+import { Logger } from '@triplit/types/logger';
 import { isAnyOrUndefined } from './utility-types.js';
 import { Unalias, FetchResult, FetchResultEntity } from './query/types';
 
diff --git a/packages/db/test/typecheck/query.test-d.ts b/packages/db/test/typecheck/query.test-d.ts
index baf6cd59..9af8341c 100644
--- a/packages/db/test/typecheck/query.test-d.ts
+++ b/packages/db/test/typecheck/query.test-d.ts
@@ -10,7 +10,10 @@ import {
   WhereFilter,
 } from '../../src/query.js';
 import { DBTransaction } from '../../src/db-transaction.js';
-import { FetchResultEntity } from '../../src/query/types';
+import {
+  CollectionQueryDefault,
+  FetchResultEntity,
+} from '../../src/query/types';
 
 function fakeTx<M extends Models<any, any> | undefined>(
   db: DB<M>
@@ -799,7 +802,7 @@ describe('query builder', () => {
         .toEqualTypeOf<
           | ValueCursor
           | FetchResultEntity<
-              CollectionQuery<typeof schema.collections, 'test'>
+              CollectionQueryDefault<typeof schema.collections, 'test'>
             >
           | undefined
         >();