[types] Import fixes

Author: jamesgpearce

src/@types/persisters/persister-partykit-client/docs.js

@@ -43,7 +43,7 @@
    * then gets the PartySocket back out again.
    *
    * ```js yolo
-   * import PartySocket from 'partysocket';
+   * import {PartySocket} from 'partysocket';
    * import {createPartyKitPersister} from 'tinybase/persisters/persister-partykit-client';
    * import {createStore} from 'tinybase';
    *
@@ -162,7 +162,7 @@
  * browser's IndexedDB storage.
  *
  * ```js yolo
- * import PartySocket from 'partysocket';
+ * import {PartySocket} from 'partysocket';
  * import {createPartyKitPersister} from 'tinybase/persisters/persister-partykit-client';
  * import {createStore} from 'tinybase';
  *

test/unit/core/ui-react/hooks.test.tsx

@@ -7,10 +7,8 @@ import type {
   MapCell,
   MapValue,
   MergeableStore,
-  Persister,
   Row,
   Store,
-  Synchronizer,
   Table,
   Tables,
   Value,
@@ -151,6 +149,8 @@ import {
   createRelationships,
   createStore,
 } from 'tinybase';
+import type {Persister} from 'tinybase/persisters';
+import type {Synchronizer} from 'tinybase/synchronizers';
 import {createFilePersister} from 'tinybase/persisters/persister-file';
 import {createLocalSynchronizer} from 'tinybase/synchronizers/synchronizer-local';
 import {jest} from '@jest/globals';

test/unit/persisters/automerge.test.ts

@@ -3,7 +3,8 @@ import {
   resetNetwork,
 } from '../common/automerge-adaptor.ts';
 import {DocHandle, Repo} from '@automerge/automerge-repo';
-import type {Persister, Store} from 'tinybase';
+import type {Persister} from 'tinybase/persisters';
+import type {Store} from 'tinybase';
 import {createAutomergePersister} from 'tinybase/persisters/persister-automerge';
 import {createStore} from 'tinybase';
 import {pause} from '../common/other.ts';

test/unit/persisters/common/databases.ts

@@ -1,18 +1,14 @@
 import 'fake-indexeddb/auto';
 import {Client, createClient} from '@libsql/client';
-import {
-  type DatabasePersisterConfig,
-  type Persister,
-  type Store,
-  getUniqueId,
-} from 'tinybase';
+import type {DatabasePersisterConfig, Persister} from 'tinybase/persisters';
 import {ElectricDatabase, electrify} from 'electric-sql/wa-sqlite';
 import type {
   QueryResult,
   SQLWatchOptions,
   WatchOnChangeEvent,
 } from '@powersync/common';
 import type {ReservedSql, Sql} from 'postgres';
+import {type Store, getUniqueId} from 'tinybase';
 import initWasm, {DB} from '@vlcn.io/crsqlite-wasm';
 import sqlite3, {Database} from 'sqlite3';
 import {DbSchema} from 'electric-sql/client/model';

test/unit/persisters/common/mocks.ts

@@ -1,22 +1,23 @@
 import type {
   Changes,
   Content,
-  DatabasePersisterConfig,
   Id,
   MergeableChanges,
   MergeableContent,
   MergeableStore,
-  Persister,
-  PersisterListener,
-  Persists,
-  Receive,
   Store,
-  Synchronizer,
   Tables,
   Values,
 } from 'tinybase';
+import type {
+  DatabasePersisterConfig,
+  Persister,
+  PersisterListener,
+  Persists,
+} from 'tinybase/persisters';
 import {DocHandle, Repo} from '@automerge/automerge-repo';
 import {GetLocationMethod, Persistable} from './other.ts';
+import type {Receive, Synchronizer} from 'tinybase/synchronizers';
 import {Doc as YDoc, Map as YMap} from 'yjs';
 import {
   createLocalPersister,

test/unit/persisters/common/other.ts

@@ -4,10 +4,9 @@ import type {
   MergeableChanges,
   MergeableContent,
   MergeableStore,
-  Persister,
-  Persists,
   Store,
 } from 'tinybase';
+import type {Persister, Persists} from 'tinybase/persisters';
 import {pause} from '../../common/other.ts';
 
 export type GetLocationMethod<Location = string> = [

test/unit/persisters/database/json.test.ts

@@ -1,8 +1,9 @@
 /* eslint-disable max-len */
 import 'fake-indexeddb/auto';
 import {ALL_VARIANTS, getDatabaseFunctions} from '../common/databases.ts';
-import type {Persister, Store} from 'tinybase';
 import {mockFetchWasm, pause} from '../../common/other.ts';
+import type {Persister} from 'tinybase/persisters';
+import type {Store} from 'tinybase';
 import {createStore} from 'tinybase';
 
 describe.each(Object.entries(ALL_VARIANTS))(

test/unit/persisters/database/mergeable-json.test.ts

@@ -1,8 +1,9 @@
 /* eslint-disable max-len */
 import 'fake-indexeddb/auto';
 import {MERGEABLE_VARIANTS, getDatabaseFunctions} from '../common/databases.ts';
-import type {MergeableStore, Persister} from 'tinybase';
 import {mockFetchWasm, pause} from '../../common/other.ts';
+import type {MergeableStore} from 'tinybase';
+import type {Persister} from 'tinybase/persisters';
 import {createMergeableStore} from 'tinybase';
 import {resetHlc} from '../../common/mergeable.ts';
 

test/unit/persisters/database/tabular.test.ts

@@ -2,8 +2,9 @@
 /* eslint-disable max-len */
 import 'fake-indexeddb/auto';
 import {ALL_VARIANTS, getDatabaseFunctions} from '../common/databases.ts';
-import type {Persister, Store} from 'tinybase';
 import {mockFetchWasm, pause} from '../../common/other.ts';
+import type {Persister} from 'tinybase/persisters';
+import type {Store} from 'tinybase';
 import {createStore} from 'tinybase';
 
 describe.each(Object.entries(ALL_VARIANTS))(

test/unit/persisters/mergeable.test.ts

@@ -6,7 +6,6 @@ import type {
   MergeableChanges,
   MergeableContent,
   MergeableStore,
-  Persister,
 } from 'tinybase';
 import {GetLocationMethod, Persistable, nextLoop} from './common/other.ts';
 import {Persists, createCustomPersister} from 'tinybase/persisters';
@@ -23,6 +22,7 @@ import {
   mockSessionStorage,
 } from './common/mocks.ts';
 import {MERGEABLE_VARIANTS} from './common/databases.ts';
+import type {Persister} from 'tinybase/persisters';
 import {pause} from '../common/other.ts';
 import {resetHlc} from '../common/mergeable.ts';