convex-ents 0.11.0 → 0.12.0

package/dist/index.js

@@ -305,15 +305,19 @@ var EntDefinitionImpl = class {
       throw new Error(`Duplicate edge "${edgeName}"`);
     }
     const to = options?.to ?? edgeName + "s";
-    if (options?.optional !== true) {
+    if (options?.field !== void 0 || options?.optional !== true) {
       const fieldName = options?.field ?? edgeName + "Id";
-      this.documentSchema = { ...this.documentSchema, [fieldName]: import_values.v.id(to) };
+      this.documentSchema = {
+        ...this.documentSchema,
+        [fieldName]: options?.optional === true ? import_values.v.optional(import_values.v.id(to)) : import_values.v.id(to)
+      };
       this.edgeConfigs[edgeName] = {
         name: edgeName,
         to,
         cardinality: "single",
         type: "field",
-        field: fieldName
+        field: fieldName,
+        optional: options?.optional === true
       };
       this.indexes.push({
         indexDescriptor: fieldName,
@@ -1185,7 +1189,7 @@ var PromiseEdgeOrNullImpl = class _PromiseEdgeOrNullImpl extends PromiseEntsOrNu
     if (sourceId === null) {
       return null;
     }
-    const edgeDoc = this.ctx.db.query(this.edgeDefinition.table).withIndex(
+    const edgeDoc = await this.ctx.db.query(this.edgeDefinition.table).withIndex(
       edgeCompoundIndexName(this.edgeDefinition),
       (q) => q.eq(this.edgeDefinition.field, sourceId).eq(
         this.edgeDefinition.ref,
@@ -1441,10 +1445,18 @@ var PromiseEntOrNullImpl = class extends Promise {
         return {
           id: otherId,
           doc: async () => {
+            if (otherId === void 0) {
+              if (edgeDefinition.optional) {
+                return null;
+              }
+              throw new Error(
+                `Unexpected null reference for edge "${edgeDefinition.name}" in table "${this.table}" on document with ID "${id}": Expected an ID for a document in table "${edgeDefinition.to}".`
+              );
+            }
             const otherDoc = await this.ctx.db.get(otherId);
             if (otherDoc === null) {
               throw new Error(
-                `Dangling reference for edge "${edgeDefinition.name}" in table "${this.table}" for document with ID "${id}": Could not find a document with ID "${otherId}" in table "${edgeDefinition.to}".`
+                `Dangling reference for edge "${edgeDefinition.name}" in table "${this.table}" on document with ID "${id}": Could not find a document with ID "${otherId}" in table "${edgeDefinition.to}".`
               );
             }
             return otherDoc;