convex-ents 0.7.1 → 0.7.2

package/dist/index.js

@@ -367,16 +367,23 @@ var EntDefinitionImpl = class {
 };
 function getEntDefinitions(schema) {
   const tables = schema.tables;
-  return Object.keys(tables).reduce(
-    (acc, tableName) => ({
-      ...acc,
-      [tableName]: {
-        defaults: tables[tableName].defaults,
-        edges: tables[tableName].edgeConfigs,
-        fields: tables[tableName].fieldConfigs,
-        deletionConfig: tables[tableName].deletionConfig
-      }
-    }),
+  return Object.entries(tables).reduce(
+    (acc, [tableName, table]) => {
+      acc[tableName] = {
+        indexes: table.indexes.reduce(
+          (acc2, { indexDescriptor, fields }) => {
+            acc2[indexDescriptor] = fields;
+            return acc2;
+          },
+          {}
+        ),
+        defaults: table.defaults,
+        edges: table.edgeConfigs,
+        fields: table.fieldConfigs,
+        deletionConfig: table.deletionConfig
+      };
+      return acc;
+    },
     {}
   );
 }
@@ -932,11 +939,22 @@ var PromiseTableImpl = class extends PromiseQueryOrNullImpl {
           }
         };
       } : async () => {
-        const [indexName, value] = args;
-        const doc = await this.ctx.db.query(this.table).withIndex(indexName, (q) => q.eq(indexName, value)).unique();
+        const [indexName, ...values] = args;
+        const fieldNames = getIndexFields(
+          this.entDefinitions,
+          this.table,
+          indexName
+        );
+        const doc = await this.ctx.db.query(this.table).withIndex(
+          indexName,
+          (q) => values.reduce((q2, value, i) => q2.eq(fieldNames[i], value), q)
+        ).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${values.reduce(
+              (message, value, i) => `${message} "${fieldNames[i]}" = \`${value}\``,
+              ""
+            )}`
           );
         }
         return loadedRetriever(doc);
@@ -1629,6 +1647,9 @@ async function filterByReadRule(ctx, entDefinitions, table, docs, throwIfNull) {
   );
   return docs.filter((_, i) => decisions[i]);
 }
+function getIndexFields(entDefinitions, table, index) {
+  return entDefinitions[table].indexes[index];
+}
 function getReadRule(entDefinitions, table) {
   return entDefinitions.rules?.[table]?.read;
 }