@powerhousedao/reactor 6.0.0-dev.216 → 6.0.0-dev.217

package/dist/index.js

@@ -1691,17 +1691,21 @@ var KyselyOperationIndex = class KyselyOperationIndex {
 	}
 	async find(collectionId, cursor, view, paging, signal) {
 		if (signal?.aborted) throw new Error("Operation aborted");
-		let query = this.queryExecutor.selectFrom("operation_index_operations as oi").innerJoin("document_collections as dc", "oi.documentId", "dc.documentId").selectAll("oi").select(["dc.documentId", "dc.collectionId"]).where("dc.collectionId", "=", collectionId).where(sql`(dc."leftOrdinal" IS NULL OR oi.ordinal < dc."leftOrdinal")`).orderBy("oi.ordinal", "asc");
-		if (cursor !== void 0) query = query.where("oi.ordinal", ">", cursor);
-		if (view?.branch) query = query.where("oi.branch", "=", view.branch);
-		if (view?.scopes && view.scopes.length > 0) query = query.where("oi.scope", "in", view.scopes);
-		if (view?.excludeSourceRemote) query = query.where("oi.sourceRemote", "!=", view.excludeSourceRemote);
-		if (paging?.cursor) {
-			const cursorOrdinal = Number.parseInt(paging.cursor, 10);
-			query = query.where("oi.ordinal", ">", cursorOrdinal);
-		}
-		if (paging?.limit) query = query.limit(paging.limit + 1);
-		const rows = await query.execute();
+		const outerCursor = cursor ?? -1;
+		const pagingCursorOrdinal = paging?.cursor !== void 0 ? Number.parseInt(paging.cursor, 10) : -1;
+		const buildBranch = (kind) => {
+			let qb = this.queryExecutor.selectFrom("operation_index_operations as oi").innerJoin("document_collections as dc", "oi.documentId", "dc.documentId").selectAll("oi").select(["dc.documentId", "dc.collectionId"]).where("dc.collectionId", "=", collectionId).where(sql`(dc."leftOrdinal" IS NULL OR oi.ordinal < dc."leftOrdinal")`);
+			if (kind === "joiner") qb = qb.where("dc.joinedOrdinal", ">", BigInt(outerCursor)).where("oi.ordinal", "<=", outerCursor);
+			else qb = qb.where("oi.ordinal", ">", outerCursor);
+			qb = qb.where("oi.ordinal", ">", pagingCursorOrdinal);
+			if (view?.branch) qb = qb.where("oi.branch", "=", view.branch);
+			if (view?.scopes && view.scopes.length > 0) qb = qb.where("oi.scope", "in", view.scopes);
+			if (view?.excludeSourceRemote) qb = qb.where("oi.sourceRemote", "!=", view.excludeSourceRemote);
+			return qb;
+		};
+		let unionQuery = buildBranch("joiner").unionAll(buildBranch("newOps")).orderBy("ordinal", "asc");
+		if (paging?.limit) unionQuery = unionQuery.limit(paging.limit + 1);
+		const rows = await unionQuery.execute();
 		let hasMore = false;
 		let items = rows;
 		if (paging?.limit && rows.length > paging.limit) {