@confect/server 9.1.0 → 9.1.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@confect/server",
   "description": "Backend bindings to the Convex platform",
-  "version": "9.1.0",
+  "version": "9.1.2",
   "author": "RJ Dellecese",
   "bugs": {
     "url": "https://github.com/rjdellecese/confect/issues"
@@ -68,7 +68,7 @@
     "@effect/platform-node": "^0.106.0",
     "convex": "^1.32.0",
     "effect": "^3.21.2",
-    "@confect/core": "^9.1.0"
+    "@confect/core": "^9.1.2"
   },
   "peerDependenciesMeta": {
     "@effect/platform-node": {

package/src/DatabaseWriter.ts

@@ -123,7 +123,7 @@ export const make = <DatabaseSchema_ extends DatabaseSchema.AnyWithProps>(
     const patch = (
       id: GenericId<TableName>,
       patchedValues: Partial<
-        WithoutSystemFields<DocumentByName_<DataModel_, TableName>>
+        Document.WithoutSystemFields<DocumentByName_<DataModel_, TableName>>
       >,
     ) =>
       Effect.gen(function* () {
@@ -162,7 +162,9 @@ export const make = <DatabaseSchema_ extends DatabaseSchema.AnyWithProps>(
 
     const replace = (
       id: GenericId<TableName>,
-      value: WithoutSystemFields<DocumentByName_<DataModel_, TableName>>,
+      value: Document.WithoutSystemFields<
+        DocumentByName_<DataModel_, TableName>
+      >,
     ) =>
       Effect.gen(function* () {
         const updatedEncodedDoc = yield* Document.encode(

package/src/Document.ts

@@ -15,7 +15,9 @@ export type Document<
   TableName extends DatabaseSchema.TableNames<Schema_>,
 > = DataModel.DocumentByName<DataModel.FromSchema<Schema_>, TableName>;
 
-export type WithoutSystemFields<Doc> = Omit<Doc, "_creationTime" | "_id">;
+export type WithoutSystemFields<Doc> = Doc extends unknown
+  ? Omit<Doc, "_creationTime" | "_id">
+  : never;
 
 export type Any = any;
 export type AnyEncoded = ReadonlyRecord<string, ReadonlyValue>;

package/src/TableInfo.ts

@@ -1,5 +1,4 @@
 import type {
-  Expand,
   GenericDocument,
   GenericFieldPaths,
   GenericTableIndexes,
@@ -20,7 +19,7 @@ export type TypeId = typeof TypeId;
 export type TableInfo<Table_ extends Table.AnyWithProps> =
   Table_ extends Table.Table<
     infer TableName,
-    infer _TableSchema,
+    infer TableSchema_,
     infer TableValidator,
     infer Indexes,
     infer SearchIndexes,
@@ -28,8 +27,14 @@ export type TableInfo<Table_ extends Table.AnyWithProps> =
   >
     ? {
         readonly [TypeId]: TypeId;
-        readonly document: Table_["Doc"]["Type"];
-        readonly encodedDocument: Table_["Doc"]["Encoded"];
+        readonly document: WithSystemFields<
+          TableName,
+          Schema.Schema.Type<TableSchema_>
+        >;
+        readonly encodedDocument: WithSystemFields<
+          TableName,
+          Schema.Schema.Encoded<TableSchema_>
+        >;
         readonly convexDocument: ExtractConvexDocument<
           TableName,
           TableValidator
@@ -72,6 +77,10 @@ export type TableSchema<TableInfo_ extends AnyWithProps> = Schema.Schema<
 
 export type Document<TableInfo_ extends AnyWithProps> = TableInfo_["document"];
 
+type WithSystemFields<TableName extends string, Doc> = Doc extends unknown
+  ? IdField<TableName> & SystemFields & Doc
+  : never;
+
 // Vendored types from convex-js, partially modified.
 // See https://github.com/get-convex/convex-js/pull/14
 
@@ -83,8 +92,8 @@ type ExtractConvexDocument<
   TableName extends string,
   T extends GenericValidator,
 > =
-  Expand<IdField<TableName> & SystemFields & T["type"]> extends GenericDocument
-    ? Expand<IdField<TableName> & SystemFields & T["type"]>
+  WithSystemFields<TableName, T["type"]> extends GenericDocument
+    ? WithSystemFields<TableName, T["type"]>
     : never;
 
 // End of vendored types from convex-js, partially modified.