convex-ents 0.18.0 → 0.19.0

package/dist/index.js

@@ -463,6 +463,15 @@ function getEntDefinitions(schema) {
 function getEdgeDefinitions(entDefinitions, table) {
   return entDefinitions[table].edges;
 }
+function systemAwareGet(db, table, id) {
+  return isSystemTable(table) ? db.system.get(table, id) : db.get(table, id);
+}
+function systemAwareQuery(db, table) {
+  return isSystemTable(table) ? db.system.query(table) : db.query(table);
+}
+function isSystemTable(table) {
+  return table.startsWith("_");
+}
 
 // src/writer.ts
 var import_server2 = require("convex/server");
@@ -496,7 +505,7 @@ var WriterImplBase = class _WriterImplBase {
             }
           } else if (edgeDefinition.cardinality === "single") {
             if (edgeDefinition.deletion !== void 0 && (!isDeletingSoftly || edgeDefinition.deletion === "soft")) {
-              const doc = await this.ctx.db.get(id);
+              const doc = await this.ctx.db.get(this.table, id);
               if (doc !== null) {
                 const otherId = doc[edgeDefinition.field];
                 edges[key] = {
@@ -702,7 +711,7 @@ var WriterImplBase = class _WriterImplBase {
     if (id !== void 0) {
       const readPolicy = getReadRule(this.entDefinitions, this.table);
       if (readPolicy !== void 0) {
-        const doc = await this.ctx.db.get(id);
+        const doc = await this.ctx.db.get(this.table, id);
         if (doc === null) {
           throw new Error(
             `Cannot update document with ID "${id}" in table "${this.table} because it does not exist"`
@@ -721,7 +730,7 @@ var WriterImplBase = class _WriterImplBase {
       return;
     }
     const ent = id === void 0 ? void 0 : entWrapper(
-      await this.ctx.db.get(id),
+      await this.ctx.db.get(this.table, id),
       this.ctx,
       this.entDefinitions,
       this.table
@@ -751,9 +760,6 @@ var WriterImplBase = class _WriterImplBase {
     }
   }
 };
-function isSystemTable(table) {
-  return table.startsWith("_");
-}
 
 // src/functions.ts
 var PromiseQueryOrNullImpl = class _PromiseQueryOrNullImpl extends Promise {
@@ -993,7 +999,7 @@ var PromiseTableImpl = class extends PromiseQueryOrNullImpl {
       ctx,
       entDefinitions,
       table,
-      async () => isSystemTable(table) ? ctx.db.system.query(table) : ctx.db.query(table)
+      async () => systemAwareQuery(ctx.db, table)
     );
   }
   get(...args) {
@@ -1021,7 +1027,7 @@ var PromiseTableImpl = class extends PromiseQueryOrNullImpl {
         return {
           id,
           doc: async () => {
-            const doc = await (isSystemTable(this.table) ? this.ctx.db.system.get(id) : this.ctx.db.get(id));
+            const doc = await systemAwareGet(this.ctx.db, this.table, id);
             if (throwIfNull && doc === null) {
               throw new Error(
                 `Document not found with id \`${id}\` in table "${this.table}"`
@@ -1037,7 +1043,7 @@ var PromiseTableImpl = class extends PromiseQueryOrNullImpl {
           this.table,
           indexName
         );
-        const doc = await this.ctx.db.query(this.table).withIndex(
+        const doc = await systemAwareQuery(this.ctx.db, this.table).withIndex(
           indexName,
           (q) => values.reduce((q2, value, i) => q2.eq(fieldNames[i], value), q)
         ).unique();
@@ -1070,7 +1076,7 @@ var PromiseTableImpl = class extends PromiseQueryOrNullImpl {
         });
         return await Promise.all(
           ids.map(async (id) => {
-            const doc = await (isSystemTable(this.table) ? this.ctx.db.system.get(id) : this.ctx.db.get(id));
+            const doc = await systemAwareGet(this.ctx.db, this.table, id);
             if (throwIfNull && doc === null) {
               throw new Error(
                 `Document not found with id \`${id}\` in table "${this.table}"`
@@ -1081,12 +1087,23 @@ var PromiseTableImpl = class extends PromiseQueryOrNullImpl {
         );
       } : async () => {
         const [indexName, values] = args;
+        const fieldNames = getIndexFields(
+          this.entDefinitions,
+          this.table,
+          indexName
+        );
+        if (fieldNames.length > 1) {
+          throw new Error(
+            `Index "${indexName}" has ${fieldNames.length} fields, but getMany() supports only single field indexes`
+          );
+        }
+        const fieldName = fieldNames[0];
         return await Promise.all(
           values.map(async (value) => {
-            const doc = await this.ctx.db.query(this.table).withIndex(indexName, (q) => q.eq(indexName, value)).unique();
+            const doc = await systemAwareQuery(this.ctx.db, this.table).withIndex(indexName, (q) => q.eq(fieldName, value)).unique();
             if (throwIfNull && doc === null) {
               throw new Error(
-                `Table "${this.table}" does not contain document with field "${indexName}" = \`${value}\``
+                `Table "${this.table}" does not contain document with field "${fieldName}" = \`${value}\``
               );
             }
             return doc;
@@ -1247,7 +1264,11 @@ var PromiseEdgeOrNullImpl = class _PromiseEdgeOrNullImpl extends PromiseEntsOrNu
   constructor(ctx, entDefinitions, table, edgeDefinition, retrieveSourceId, retrieveQuery, retrieveDoc = async (edgeDoc) => {
     const sourceId = edgeDoc[edgeDefinition.field];
     const targetId = edgeDoc[edgeDefinition.ref];
-    const doc = await this.ctx.db.get(targetId);
+    const doc = await systemAwareGet(
+      this.ctx.db,
+      edgeDefinition.to,
+      targetId
+    );
     if (doc === null) {
       throw new Error(
         `Dangling reference for edge "${edgeDefinition.name}" in table "${this.table}" for document with ID "${sourceId}": Could not find a document with ID "${targetId}" in table "${edgeDefinition.to}" (edge document ID is "${edgeDoc._id}").`
@@ -1543,7 +1564,11 @@ var PromiseEntOrNullImpl = class extends Promise {
                 `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);
+            const otherDoc = await systemAwareGet(
+              this.ctx.db,
+              edgeDefinition.to,
+              otherId
+            );
             if (otherDoc === null && edgeDefinition.to !== "_scheduled_functions") {
               throw new Error(
                 `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}".`
@@ -1816,7 +1841,7 @@ var PromiseEntWriterImpl = class extends PromiseEntOrNullImpl {
             }
             if (edgeDefinition.cardinality === "single") {
               if (edgeDefinition.type === "ref") {
-                const oldDoc = await this.ctx.db.get(docId);
+                const oldDoc = await this.ctx.db.get(this.table, docId);
                 if (oldDoc[key] !== void 0 && oldDoc[key] !== idOrIds) {
                   throw new Error("Cannot set 1:1 edge from ref end.");
                 }
@@ -1878,7 +1903,10 @@ var PromiseEntIdImpl = class extends Promise {
       this.table,
       async () => {
         const id = await this.retrieve();
-        return { id, doc: async () => this.ctx.db.get(id) };
+        return {
+          id,
+          doc: async () => systemAwareGet(this.ctx.db, this.table, id)
+        };
       },
       true
     );
@@ -1963,6 +1991,12 @@ async function filterByReadRule(ctx, entDefinitions, table, docs, throwIfNull) {
   return docs.filter((_, i) => decisions[i]);
 }
 function getIndexFields(entDefinitions, table, index) {
+  if (index === "by_id") {
+    return ["_id"];
+  }
+  if (index === "by_creation_time") {
+    return ["_creationTime"];
+  }
   return entDefinitions[table].indexes[index];
 }
 function getReadRule(entDefinitions, table) {
@@ -2015,11 +2049,7 @@ function scheduledDeleteFactory(entDefinitions, options) {
       inProgress: import_values2.v.boolean()
     },
     handler: async (ctx, { origin, stack, inProgress }) => {
-      const originId = ctx.db.normalizeId(origin.table, origin.id);
-      if (originId === null) {
-        throw new Error(`Invalid ID "${origin.id}" for table ${origin.table}`);
-      }
-      const doc = await ctx.db.get(originId);
+      const doc = await ctx.db.get(origin.table, origin.id);
       if (doc.deletionTime !== origin.deletionTime) {
         if (inProgress) {
           console.error(
@@ -2037,7 +2067,7 @@ function scheduledDeleteFactory(entDefinitions, options) {
         newCounter(),
         inProgress ? stack : [
           {
-            id: originId,
+            id: origin.id,
             table: origin.table,
             edges: getEdgeArgs(entDefinitions, origin.table)
           }