Fix tests that were broken because shape definition would not match when the table was passed.

Author: balegas

packages/typescript-client/test/client.test.ts

@@ -277,7 +277,7 @@ describe.for(fetchAndSse)(`Shape  (liveSSE=$liveSse)`, ({ liveSse }) => {
             await deleteIssue({ id: id1, title: `foo1` })
             await insertIssues({ id: id2, title: `foo2` })
             await waitForIssues({ numChangesExpected: 3 })
-            await clearIssuesShape(shapeStream.shapeHandle)
+            await clearIssuesShape(shapeStream.shapeHandle!)
           })
 
           rotationTime = Date.now()
@@ -1012,7 +1012,7 @@ describe.for(fetchAndSse)(`Shape  (liveSSE=$liveSse)`, ({ liveSse }) => {
       unsub()
       // the normal cleanup doesn't work because our shape definition is
       // changed by the updates: 'full' param
-      await clearIssuesShape(shapeStream.shapeHandle)
+      await clearIssuesShape(shapeStream.shapeHandle!)
     }
   })
 
@@ -2037,7 +2037,7 @@ describe.for(fetchAndSse)(
         await deleteIssue({ id: id2, title: `snap2` })
         await insertIssues({ title: `snap3` })
         await waitForIssues({ numChangesExpected: 2 })
-        await clearIssuesShape(shapeStream.shapeHandle)
+        await clearIssuesShape(shapeStream.shapeHandle!)
       })
 
       // Wait until shape reflects re-executed snapshot on the new shape

packages/typescript-client/test/integration.test.ts

@@ -973,7 +973,7 @@ describe(`HTTP Sync`, () => {
         // that the existing shape is deleted and some more data is inserted
         if (numRequests === 2) {
           await insertIssues({ id: rowId2, title: `foo2` })
-          await clearIssuesShape(issueStream.shapeHandle)
+          await clearIssuesShape(issueStream.shapeHandle!)
         }
 
         numRequests++

packages/typescript-client/test/support/test-context.ts

@@ -11,7 +11,7 @@ export type GeneratedIssueRow = { id?: string; title: string }
 export type UpdateIssueFn = (row: IssueRow) => Promise<QueryResult<IssueRow>>
 export type DeleteIssueFn = (row: IssueRow) => Promise<QueryResult<IssueRow>>
 export type InsertIssuesFn = (...rows: GeneratedIssueRow[]) => Promise<string[]>
-export type ClearIssuesShapeFn = (handle?: string) => Promise<void>
+export type ClearIssuesShapeFn = (handle: string) => Promise<void>
 export type ClearShapeFn = (
   table: string,
   options?: { handle?: string }
@@ -52,10 +52,13 @@ export const testWithDbClient = test.extend<{
       ) => {
         const baseUrl = inject(`baseUrl`)
         const url = new URL(`${baseUrl}/v1/shape`)
-        url.searchParams.set(`table`, table)
 
+        // if an handle is provided, don't pass the table
+        // as the shape definition might have more params
         if (options.handle) {
           url.searchParams.set(SHAPE_HANDLE_QUERY_PARAM, options.handle)
+        } else {
+          url.searchParams.set(`table`, table)
         }
 
         const resp = await fetch(url.toString(), { method: `DELETE` })