[connectors] Still adjusting API

Author: jamesgpearce

src/@types/connector/fs/index.d.ts

@@ -72,20 +72,11 @@ export function createDirectoryMetaConnector<Depth extends number>(
   directory: string,
 ): DirectoryMetaConnector<Depth>;
 
-/// DirectoryConnectorsOptions
-export type DirectoryConnectorsOptions = {
-  /// DirectoryConnectorsOptions.dataDirectory
-  dataDirectory?: string;
-
-  /// DirectoryConnectorsOptions.metaDirectory
-  metaDirectory?: string;
-};
-
 /// createDirectoryConnectors
 export function createDirectoryConnectors<Depth extends number>(
   depth: Depth,
-  directory: string,
-  options?: DirectoryConnectorsOptions,
+  dataDirectory: string,
+  metaDirectory: string,
 ): Connectors<
   Depth,
   DirectoryDataConnector<Depth>,

src/connector/fs/directory.ts

@@ -11,11 +11,8 @@ export const createDirectoryConnectors: typeof createDirectoryConnectorsDecl = <
   Depth extends number,
 >(
   depth: Depth,
-  directory: string,
-  {
-    dataDirectory = directory,
-    metaDirectory = directory,
-  }: {dataDirectory?: string; metaDirectory?: string} = {},
+  dataDirectory: string,
+  metaDirectory: string,
 ) => [
   createDirectoryDataConnector(depth, dataDirectory),
   createDirectoryMetaConnector(depth, metaDirectory),

test/unit/connector/database/pglite-connectors.test.ts

@@ -2,6 +2,7 @@
 import {PGlite} from '@electric-sql/pglite';
 import {createSynclet} from 'synclets';
 import {
+  createPgliteConnectors,
   createPgliteDataConnector,
   createPgliteMetaConnector,
 } from 'synclets/connector/database/pglite';
@@ -55,6 +56,24 @@ test('getPglite', async () => {
   await synclet.destroy();
 });
 
+test('getPglite, connectors', async () => {
+  const pglite = await PGlite.create();
+  const connectors = createPgliteConnectors(1, pglite, {
+    dataTable: 'data',
+    metaTable: 'meta',
+  });
+
+  const synclet = await createSynclet({connectors});
+  expect(connectors[0].getPglite()).toEqual(pglite);
+  expect(synclet.getDataConnector().getPglite()).toEqual(pglite);
+
+  expect(connectors[1].getPglite()).toEqual(pglite);
+  expect(synclet.getMetaConnector().getPglite()).toEqual(pglite);
+  await pglite.close();
+
+  await synclet.destroy();
+});
+
 describe('data schema checks', async () => {
   let pglite: PGlite;
 

test/unit/connector/database/pglite.test.ts

@@ -3,6 +3,7 @@ import {tmpdir} from 'os';
 import {join, sep} from 'path';
 import {createSynclet} from 'synclets';
 import {
+  createDirectoryConnectors,
   createDirectoryDataConnector,
   createDirectoryMetaConnector,
 } from 'synclets/connector/fs';
@@ -43,6 +44,24 @@ test('getDirectory', async () => {
   await synclet.destroy();
 });
 
+test('getDirectory, connectors', async () => {
+  const tmpDir = await mkdtemp(tmpdir() + sep);
+
+  const dataDirectory = join(tmpDir, getUniqueId() + '.data');
+  const metaDirectory = join(tmpDir, getUniqueId() + '.meta');
+  const connectors = createDirectoryConnectors(1, dataDirectory, metaDirectory);
+  const synclet = await createSynclet({connectors});
+
+  expect(connectors[0].getDirectory()).toEqual(dataDirectory);
+  expect(synclet.getDataConnector().getDirectory()).toEqual(dataDirectory);
+  expect(connectors[1].getDirectory()).toEqual(metaDirectory);
+  expect(synclet.getMetaConnector().getDirectory()).toEqual(metaDirectory);
+
+  await rm(tmpDir, {recursive: true, force: true});
+
+  await synclet.destroy();
+});
+
 test('non-path addresses', async () => {
   const tmpDir = await mkdtemp(tmpdir() + sep);
 

test/unit/connector/directory.test.ts

@@ -3,6 +3,7 @@ import {tmpdir} from 'os';
 import {join, sep} from 'path';
 import {createSynclet} from 'synclets';
 import {
+  createFileConnectors,
   createFileDataConnector,
   createFileMetaConnector,
 } from 'synclets/connector/fs';
@@ -41,3 +42,20 @@ test('getFile', async () => {
 
   await synclet.destroy();
 });
+
+test('getFile, connectors', async () => {
+  const tmp = await mkdtemp(tmpdir() + sep);
+
+  const dataFile = join(tmp, getUniqueId() + '.data');
+  const metaFile = join(tmp, getUniqueId() + '.meta');
+  const connectors = createFileConnectors(1, tmp, {dataFile, metaFile});
+  const synclet = await createSynclet({connectors});
+  expect(connectors[0].getFile()).toEqual(dataFile);
+  expect(synclet.getDataConnector().getFile()).toEqual(dataFile);
+  expect(connectors[1].getFile()).toEqual(metaFile);
+  expect(synclet.getMetaConnector().getFile()).toEqual(metaFile);
+
+  await rm(tmp, {recursive: true, force: true});
+
+  await synclet.destroy();
+});