Make ctx.db types match [email protected] (#884)

Author: Nicolapps

package-lock.json

@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "classnames": "^2.3.2",
-    "convex": "^1.31.0",
+    "convex": "^1.31.2",
     "convex-helpers": "file:packages/convex-helpers/dist",
     "hono": "^4.3.6",
     "react": "^19.2.3",

package.json

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.1.109 (upcoming)
+
+- Triggers/row-level security: fix a type issue with the `ctx.db` APIs with
+  table name arguments (see the changelog of
+  [`[email protected]`](https://github.com/get-convex/convex-js/blob/main/CHANGELOG.md#1312))
+
 ## 0.1.108
 
 - `makeUseQueryWithStatus`: fix handling of some argument values

packages/convex-helpers/CHANGELOG.md

@@ -237,8 +237,8 @@ class WrapReader<Ctx, DataModel extends GenericDataModel>
   }
 
   get<TableName extends TableNamesInDataModel<DataModel>>(
-    table: NonUnion<TableName>,
-    id: GenericId<TableName>,
+    table: TableName,
+    id: GenericId<NonUnion<TableName>>,
   ): Promise<DocumentByName<DataModel, TableName> | null>;
   get<TableName extends TableNamesInDataModel<DataModel>>(
     id: GenericId<TableName>,
@@ -356,8 +356,8 @@ class WrapWriter<Ctx, DataModel extends GenericDataModel>
   }
 
   patch<TableName extends TableNamesInDataModel<DataModel>>(
-    table: NonUnion<TableName>,
-    id: GenericId<TableName>,
+    table: TableName,
+    id: GenericId<NonUnion<TableName>>,
     value: Partial<DocumentByName<DataModel, TableName>>,
   ): Promise<void>;
   patch<TableName extends TableNamesInDataModel<DataModel>>(
@@ -374,8 +374,8 @@ class WrapWriter<Ctx, DataModel extends GenericDataModel>
   }
 
   replace<TableName extends TableNamesInDataModel<DataModel>>(
-    table: NonUnion<TableName>,
-    id: GenericId<TableName>,
+    table: TableName,
+    id: GenericId<NonUnion<TableName>>,
     value: WithOptionalSystemFields<DocumentByName<DataModel, TableName>>,
   ): Promise<void>;
   replace<TableName extends TableNamesInDataModel<DataModel>>(
@@ -392,8 +392,8 @@ class WrapWriter<Ctx, DataModel extends GenericDataModel>
   }
 
   delete<TableName extends TableNamesInDataModel<DataModel>>(
-    table: NonUnion<TableName>,
-    id: GenericId<TableName>,
+    table: TableName,
+    id: GenericId<NonUnion<TableName>>,
   ): Promise<void>;
   delete(id: GenericId<TableNamesInDataModel<DataModel>>): Promise<void>;
   async delete(arg0: any, arg1?: any): Promise<void> {
@@ -405,8 +405,8 @@ class WrapWriter<Ctx, DataModel extends GenericDataModel>
   }
 
   get<TableName extends TableNamesInDataModel<DataModel>>(
-    table: NonUnion<TableName>,
-    id: GenericId<TableName>,
+    table: TableName,
+    id: GenericId<NonUnion<TableName>>,
   ): Promise<DocumentByName<DataModel, TableName> | null>;
   get<TableName extends TableNamesInDataModel<DataModel>>(
     id: GenericId<TableName>,

packages/convex-helpers/server/rowLevelSecurity.ts

@@ -171,17 +171,17 @@ export class DatabaseWriterWithTriggers<
   }
 
   delete<TableName extends TableNamesInDataModel<DataModel>>(
-    table: NonUnion<TableName>,
-    id: GenericId<TableName>,
+    table: TableName,
+    id: GenericId<NonUnion<TableName>>,
   ): Promise<void>;
   delete(id: GenericId<TableNamesInDataModel<DataModel>>): Promise<void>;
   delete(arg0: any, arg1?: any): Promise<void> {
     return this.writer.delete(arg0, arg1);
   }
 
   get<TableName extends TableNamesInDataModel<DataModel>>(
-    table: NonUnion<TableName>,
-    id: GenericId<TableName>,
+    table: TableName,
+    id: GenericId<NonUnion<TableName>>,
   ): Promise<DocumentByName<DataModel, TableName> | null>;
   get<TableName extends TableNamesInDataModel<DataModel>>(
     id: GenericId<TableName>,
@@ -198,8 +198,8 @@ export class DatabaseWriterWithTriggers<
   }
 
   patch<TableName extends TableNamesInDataModel<DataModel>>(
-    table: NonUnion<TableName>,
-    id: GenericId<TableName>,
+    table: TableName,
+    id: GenericId<NonUnion<TableName>>,
     value: PatchValue<DocumentByName<DataModel, TableName>>,
   ): Promise<void>;
   patch<TableName extends TableNamesInDataModel<DataModel>>(
@@ -224,8 +224,8 @@ export class DatabaseWriterWithTriggers<
   }
 
   replace<TableName extends TableNamesInDataModel<DataModel>>(
-    table: NonUnion<TableName>,
-    id: GenericId<TableName>,
+    table: TableName,
+    id: GenericId<NonUnion<TableName>>,
     value: WithOptionalSystemFields<DocumentByName<DataModel, TableName>>,
   ): Promise<void>;
   replace<TableName extends TableNamesInDataModel<DataModel>>(
@@ -252,8 +252,8 @@ export function writerWithTriggers<
 ): GenericDatabaseWriter<DataModel> {
   const patch: {
     <TableName extends TableNamesInDataModel<DataModel>>(
-      table: NonUnion<TableName>,
-      id: GenericId<TableName>,
+      table: TableName,
+      id: GenericId<NonUnion<TableName>>,
       value: PatchValue<DocumentByName<DataModel, TableName>>,
     ): Promise<void>;
     <TableName extends TableNamesInDataModel<DataModel>>(
@@ -293,8 +293,8 @@ export function writerWithTriggers<
 
   const replace: {
     <TableName extends TableNamesInDataModel<DataModel>>(
-      table: NonUnion<TableName>,
-      id: GenericId<TableName>,
+      table: TableName,
+      id: GenericId<NonUnion<TableName>>,
       value: WithOptionalSystemFields<DocumentByName<DataModel, TableName>>,
     ): Promise<void>;
     <TableName extends TableNamesInDataModel<DataModel>>(
@@ -334,8 +334,8 @@ export function writerWithTriggers<
 
   const delete_: {
     <TableName extends TableNamesInDataModel<DataModel>>(
-      table: NonUnion<TableName>,
-      id: GenericId<TableName>,
+      table: TableName,
+      id: GenericId<NonUnion<TableName>>,
     ): Promise<void>;
     (id: GenericId<TableNamesInDataModel<DataModel>>): Promise<void>;
   } = async (arg0: any, arg1?: any) => {