@davidtkramer/convex-relations 0.6.0 → 0.6.2

package/README.md

@@ -401,9 +401,20 @@ const posts = await q.posts.in(postIds).many();
 const categories = await q.categories.bySlug
   .in(["typescript", "convex"])
   .many();
+
+// Compound indexes take positional prefixes, one tuple per lookup. A bare
+// value is the one-argument call on the leading field.
+const comments = await q.comments.byPostIdAndStatus
+  .in([
+    [postId, "approved"],
+    [otherPostId, "pending"],
+    thirdPostId,
+  ])
+  .many();
 ```
 
-Batch lookups skip missing rows.
+Each value runs as its own index query, in parallel; results are concatenated
+in list order. Batch lookups skip missing rows and dedupe the values.
 
 ## Relation Expansion with `with(...)`
 

package/dist/index.d.ts

@@ -38,7 +38,11 @@ type PositionalIndexArgs<DataModel extends GenericDataModel, Table extends AppTa
 type RootIndexValueArg<DataModel extends GenericDataModel, Table extends AppTable<DataModel>, IndexName extends UserIndex<DataModel, Table>> = PositionalIndexArgs<DataModel, Table, IndexName> | (SingleIndexField<DataModel, Table, IndexName> extends never ? never : DocFieldType<AppDoc<DataModel, Table>, SingleIndexField<DataModel, Table, IndexName>>);
 type StrictRootIndexValueArg<DataModel extends GenericDataModel, Table extends AppTable<DataModel>, IndexName extends UserIndex<DataModel, Table>, Value extends RootIndexValueArg<DataModel, Table, IndexName>> = Value;
 type TableIndexName<DataModel extends GenericDataModel, Table extends AppTable<DataModel>> = UserIndex<DataModel, Table> | 'by_id';
-type UserIndexArg<DataModel extends GenericDataModel, Table extends AppTable<DataModel>, IndexName extends UserIndex<DataModel, Table>> = SingleIndexField<DataModel, Table, IndexName> extends never ? PositionalIndexArgs<DataModel, Table, IndexName> : DocFieldType<AppDoc<DataModel, Table>, SingleIndexField<DataModel, Table, IndexName>>;
+type FirstIndexField<DataModel extends GenericDataModel, Table extends AppTable<DataModel>, IndexName extends UserIndex<DataModel, Table>> = UserIndexFields<DataModel, Table, IndexName> extends readonly [
+    infer Field extends string,
+    ...unknown[]
+] ? Field : never;
+type UserIndexArg<DataModel extends GenericDataModel, Table extends AppTable<DataModel>, IndexName extends UserIndex<DataModel, Table>> = DocFieldType<AppDoc<DataModel, Table>, FirstIndexField<DataModel, Table, IndexName>> | PositionalIndexArgs<DataModel, Table, IndexName> | Readonly<PositionalIndexArgs<DataModel, Table, IndexName>>;
 type TableIndexValueArg<DataModel extends GenericDataModel, Table extends AppTable<DataModel>, IndexName extends TableIndexName<DataModel, Table>> = IndexName extends 'by_id' ? GenericId<Table> : IndexName extends UserIndex<DataModel, Table> ? UserIndexArg<DataModel, Table, IndexName> : never;
 type StrictTableIndexValueArg<DataModel extends GenericDataModel, Table extends AppTable<DataModel>, IndexName extends TableIndexName<DataModel, Table>, Value extends TableIndexValueArg<DataModel, Table, IndexName>> = Value;
 type TableIndexInvocationArgs<DataModel extends GenericDataModel, Table extends AppTable<DataModel>, IndexName extends TableIndexName<DataModel, Table>> = IndexName extends 'by_id' ? [GenericId<Table>] : IndexName extends UserIndex<DataModel, Table> ? PositionalIndexArgs<DataModel, Table, IndexName> : never;
@@ -150,7 +154,7 @@ type ThroughCollectionSource<DataModel extends GenericDataModel, SourceTable ext
 type TableNamespace<DataModel extends GenericDataModel, Table extends AppTable<DataModel>> = {
     find<const Id extends GenericId<Table>>(id: Id): FindQueryBuilder<AppDoc<DataModel, Table>>;
     findOrNull<const Id extends GenericId<Table>>(id: Id): FindOrNullQueryBuilder<AppDoc<DataModel, Table>>;
-    in<const Id extends GenericId<Table>>(ids: Id[]): TableBatchQueryFacade<DataModel, Table>;
+    in<const Id extends GenericId<Table>>(ids: readonly Id[]): TableBatchQueryFacade<DataModel, Table>;
     withIndex<const IndexName extends UserIndex<DataModel, Table>>(index: IndexName, selector: IndexSelector<DataModel, Table, IndexName>): TableQueryFacade<DataModel, Table>;
     withIndex<const IndexName extends UserIndex<DataModel, Table>>(index: IndexName): TableRangeQueryFacade<DataModel, Table>;
     through: {
@@ -164,7 +168,7 @@ type TableNamespace<DataModel extends GenericDataModel, Table extends AppTable<D
         (selector: IndexName extends UserIndex<DataModel, Table> ? IndexSelector<DataModel, Table, IndexName> : never): TableQueryFacade<DataModel, Table>;
         <const Args extends TableIndexInvocationArgs<DataModel, Table, IndexName>>(...args: Args): TableQueryFacade<DataModel, Table, NarrowedIndexItem<DataModel, Table, IndexName, Args>>;
         (): TableRangeQueryFacade<DataModel, Table>;
-        in<const Value extends TableIndexValueArg<DataModel, Table, IndexName>>(values: StrictTableIndexValueArg<DataModel, Table, IndexName, Value>[]): TableBatchQueryFacade<DataModel, Table, NarrowedIndexItem<DataModel, Table, IndexName, Value extends readonly unknown[] ? Value : [Value]>>;
+        in<const Value extends TableIndexValueArg<DataModel, Table, IndexName>>(values: readonly StrictTableIndexValueArg<DataModel, Table, IndexName, Value>[]): TableBatchQueryFacade<DataModel, Table, NarrowedIndexItem<DataModel, Table, IndexName, Value extends readonly unknown[] ? Value : [Value]>>;
     };
 };
 type QueryFacade<DataModel extends GenericDataModel> = {

package/dist/index.js

@@ -630,10 +630,27 @@ function createBatchPlan(table, index, values, indexFields) {
     kind: "batch",
     table,
     index,
-    values,
+    values: uniqueBatchValues(values),
     indexFields
   });
 }
+function uniqueBatchValues(values) {
+  const seenScalars = /* @__PURE__ */ new Set();
+  const seenTuples = [];
+  return values.filter((value) => {
+    if (!Array.isArray(value)) {
+      if (seenScalars.has(value)) return false;
+      seenScalars.add(value);
+      return true;
+    }
+    if (seenTuples.some((other) => sameBatchValue(other, value))) return false;
+    seenTuples.push(value);
+    return true;
+  });
+}
+function sameBatchValue(a, b) {
+  return Array.isArray(a) && Array.isArray(b) && a.length === b.length && a.every((item, index) => Object.is(item, b[index]));
+}
 function isCollectionSource(value) {
   return typeof value === "object" && value !== null && "_plan" in value && "_table" in value;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@davidtkramer/convex-relations",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "Typed query facade helpers for Convex backends",
   "type": "module",
   "license": "MIT",