Merge pull request #103 from clockworklabs/tyler/stable-sdk/fix-1

Make `subscribe` private
clockworklabs · Oct 4, 2024 · 3c63d5e · 3c63d5e
2 parents b8c944c + fa03b0d
commit 3c63d5e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/packages/sdk/src/db_connection_impl.ts b/packages/sdk/src/db_connection_impl.ts
@@ -271,7 +271,8 @@ export class DBConnectionImpl<DBView = any, Reducers = any>
    * spacetimeDBClient.subscribe(["SELECT * FROM User","SELECT * FROM Message"]);
    * ```
    */
-  subscribe(
+  // This is marked private but not # because we need to use it from the builder
+  private subscribe(
     queryOrQueries: string | string[],
     onApplied?: (ctx: EventContextInterface) => void,
     _onError?: (ctx: EventContextInterface) => void

diff --git a/packages/sdk/src/db_context.ts b/packages/sdk/src/db_context.ts
@@ -92,7 +92,7 @@ export class SubscriptionBuilder {
   /// Consumes the `SubscriptionBuilder`,
   /// because the callbacks are not necessarily `Clone`.
   subscribe(query_sql: string[]): void {
-    this.db.subscribe(query_sql, this.#onApplied, this.#onError);
+    this.db['subscribe'](query_sql, this.#onApplied, this.#onError);
   }
 }
 

diff --git a/packages/sdk/tests/spacetimedb_client.test.ts b/packages/sdk/tests/spacetimedb_client.test.ts
@@ -45,8 +45,10 @@ describe('SpacetimeDBClient', () => {
       .withWSFn(wsAdapter.createWebSocketFn.bind(wsAdapter))
       .build();
 
-    client.subscribe('SELECT * FROM Player');
-    client.subscribe(['SELECT * FROM Position', 'SELECT * FROM Coin']);
+    client.subscriptionBuilder().subscribe(['SELECT * FROM Player']);
+    client
+      .subscriptionBuilder()
+      .subscribe(['SELECT * FROM Position', 'SELECT * FROM Coin']);
 
     let called = false;
     client.onConnect(() => {