move clients into their own directories

aspen-cloud · Jun 14, 2024 · e93bc84 · e93bc84
1 parent f85583e
commit e93bc84
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 25 deletions.
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -28,14 +28,14 @@
  "default": "./dist/index.js"
  },
  "./worker-client": {
- "types": "./dist/worker-client.d.ts",
- "import": "./dist/worker-client.js",
- "default": "./dist/worker-client.js"
+ "types": "./dist/worker-client/worker-client.d.ts",
+ "import": "./dist/worker-client/worker-client.js",
+ "default": "./dist/worker-client/worker-client.js"
  },
  "./worker-client-operator": {
- "types": "./dist/worker-client-operator.d.ts",
- "import": "./dist/worker-client-operator.js",
- "default": "./dist/worker-client-operator.js"
+ "types": "./dist/worker-client/worker-client-operator.d.ts",
+ "import": "./dist/worker-client/worker-client-operator.js",
+ "default": "./dist/worker-client/worker-client-operator.js"
  }
  },
  "scripts": {
@@ -47,7 +47,7 @@
  "test:unit": "vitest run",
  "typecheck": "vitest --typecheck.only --no-watch",
  "publish-pkg": "node ../../scripts/npm-check-version-and-publish.js",
- "build-worker": "esbuild ./src/worker-client-operator.ts --bundle --minify --platform=browser --outfile=./dist/worker-client-operator.js --format=esm --sourcemap"
+ "build-worker": "esbuild ./src/worker-client/worker-client-operator.ts --bundle --minify --platform=browser --outfile=./dist/worker-client/worker-client-operator.js --format=esm --sourcemap"
  },
  "files": [
  "/dist"

diff --git a/packages/client/src/triplit-client.ts → packages/client/src/client/triplit-client.ts b/packages/client/src/triplit-client.ts → packages/client/src/client/triplit-client.ts
@@ -18,23 +18,23 @@ import {
  schemaToJSON,
  Unalias,
 } from '@triplit/db';
-import { getUserId } from './token.js';
-import { UnrecognizedFetchPolicyError } from './errors.js';
+import { getUserId } from '../token.js';
+import { UnrecognizedFetchPolicyError } from '../errors.js';
 import { MemoryBTreeStorage } from '@triplit/db/storage/memory-btree';
 import { IndexedDbStorage } from '@triplit/db/storage/indexed-db';
-import { SyncTransport } from './transport/transport.js';
-import { SyncEngine } from './sync-engine.js';
+import { SyncTransport } from '../transport/transport.js';
+import { SyncEngine } from '../sync-engine.js';
 import {
  ClientFetchResult,
  ClientFetchResultEntity,
  ClientQuery,
  ClientQueryDefault,
  ClientSchema,
  clientQueryBuilder,
-} from './utils/query.js';
-import { HttpClient } from './http-client.js';
+} from '../utils/query.js';
+import { HttpClient } from '../http-client/http-client.js';
 import { Logger } from '@triplit/types/logger.js';
-import { DefaultLogger } from './client-logger.js';
+import { DefaultLogger } from '../client-logger.js';
 
 export interface SyncOptions {
  server?: string;

diff --git a/packages/client/src/http-client.ts → ...ges/client/src/http-client/http-client.ts b/packages/client/src/http-client.ts → ...ges/client/src/http-client/http-client.ts
@@ -23,7 +23,7 @@ import {
  ClientSchema,
  prepareFetchByIdQuery,
  httpClientQueryBuilder,
-} from './utils/query.js';
+} from '../utils/query.js';
 
 function parseError(error: string) {
  try {

diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts
@@ -8,8 +8,8 @@ export type {
  Unalias,
 } from '@triplit/db';
 export { Schema } from '@triplit/db';
-export * from './triplit-client.js';
-export * from './http-client.js';
+export * from './client/triplit-client.js';
+export * from './http-client/http-client.js';
 export * from './sync-engine.js';
 export * from './errors.js';
 export * from './transport/transport.js';

diff --git a/packages/client/src/sync-engine.ts b/packages/client/src/sync-engine.ts
@@ -10,7 +10,7 @@ import DB, {
  Timestamp,
  TripleStoreApi,
 } from '@triplit/db';
-import { SyncOptions, TriplitClient } from './triplit-client.js';
+import { SyncOptions, TriplitClient } from './client/triplit-client.js';
 import { Subject } from 'rxjs';
 import {
  ConnectionStatus,

diff --git a/...ages/client/src/worker-client-operator.ts → ...c/worker-client/worker-client-operator.ts b/...ages/client/src/worker-client-operator.ts → ...c/worker-client/worker-client-operator.ts
@@ -2,9 +2,7 @@ import * as ComLink from 'comlink';
 import {
  TriplitClient as Client,
  SubscriptionOptions,
-} from './triplit-client.js';
-import { ClientQuery } from './index.js';
-import { ClientFetchResultEntity } from './utils/query.js';
+} from '../client/triplit-client.js';
 import {
  Attribute,
  CollectionNameFromModels,

diff --git a/packages/client/src/worker-client.ts → ...client/src/worker-client/worker-client.ts b/packages/client/src/worker-client.ts → ...client/src/worker-client/worker-client.ts
@@ -6,7 +6,7 @@ import type {
  InfiniteSubscription,
  PaginatedSubscription,
  SubscriptionOptions,
-} from './triplit-client.js';
+} from '../client/triplit-client.js';
 import {
  ChangeTracker,
  CollectionNameFromModels,
@@ -27,8 +27,8 @@ import {
  ClientQueryDefault,
  ClientSchema,
  clientQueryBuilder,
-} from './utils/query.js';
-import { ConnectionStatus } from './index.js';
+} from '../utils/query.js';
+import { ConnectionStatus } from '../transport/transport.js';
 
 export class WorkerClient<M extends ClientSchema | undefined = undefined> {
  initialized: Promise<void>;

diff --git a/packages/client/test/client.spec.ts b/packages/client/test/client.spec.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { TriplitClient } from '../src/triplit-client.js';
+import { TriplitClient } from '../src/client/triplit-client.js';
 import { ClientFetchResult, ClientQuery } from '../src/utils/query.js';
 import { Schema as S } from '@triplit/db';