@mastra/upstash 1.2.1 → 1.2.2

package/dist/index.js

@@ -1455,6 +1455,16 @@ var StoreMemoryUpstash = class extends MemoryStorage {
 function transformScoreRow(row) {
   return transformScoreRow$1(row);
 }
+function matchesTenancy(row, filters) {
+  if (filters?.organizationId !== void 0 && row.organizationId !== filters.organizationId) return false;
+  if (filters?.projectId !== void 0 && row.projectId !== filters.projectId) return false;
+  return true;
+}
+function compareScoresByCreatedAtDesc(a, b) {
+  const createdAtDiff = new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime();
+  if (createdAtDiff !== 0) return createdAtDiff;
+  return String(b.id ?? "").localeCompare(String(a.id ?? ""));
+}
 var ScoresUpstash = class extends ScoresStorage {
   client;
   #db;
@@ -1494,7 +1504,8 @@ var ScoresUpstash = class extends ScoresStorage {
     entityId,
     entityType,
     source,
-    pagination = { page: 0, perPage: 20 }
+    pagination = { page: 0, perPage: 20 },
+    filters
   }) {
     const pattern = `${TABLE_SCORERS}:*`;
     const keys = await this.#db.scanKeys(pattern);
@@ -1524,13 +1535,14 @@ var ScoresUpstash = class extends ScoresStorage {
       if (entityId && row.entityId !== entityId) return false;
       if (entityType && row.entityType !== entityType) return false;
       if (source && row.source !== source) return false;
+      if (!matchesTenancy(row, filters)) return false;
       return true;
     });
     const perPage = normalizePerPage(perPageInput, 100);
     const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
     const end = perPageInput === false ? filtered.length : start + perPage;
     const total = filtered.length;
-    const paged = filtered.slice(start, end);
+    const paged = [...filtered].sort(compareScoresByCreatedAtDesc).slice(start, end);
     const scores = paged.map((row) => transformScoreRow(row));
     return {
       scores,
@@ -1591,7 +1603,8 @@ var ScoresUpstash = class extends ScoresStorage {
   }
   async listScoresByRunId({
     runId,
-    pagination = { page: 0, perPage: 20 }
+    pagination = { page: 0, perPage: 20 },
+    filters
   }) {
     const pattern = `${TABLE_SCORERS}:*`;
     const keys = await this.#db.scanKeys(pattern);
@@ -1615,12 +1628,14 @@ var ScoresUpstash = class extends ScoresStorage {
         }
       }
       return raw;
-    }).filter((row) => !!row && typeof row === "object" && row.runId === runId);
+    }).filter(
+      (row) => !!row && typeof row === "object" && row.runId === runId && matchesTenancy(row, filters)
+    );
     const total = filtered.length;
     const perPage = normalizePerPage(perPageInput, 100);
     const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
     const end = perPageInput === false ? filtered.length : start + perPage;
-    const paged = filtered.slice(start, end);
+    const paged = [...filtered].sort(compareScoresByCreatedAtDesc).slice(start, end);
     const scores = paged.map((row) => transformScoreRow(row));
     return {
       scores,
@@ -1635,7 +1650,8 @@ var ScoresUpstash = class extends ScoresStorage {
   async listScoresByEntityId({
     entityId,
     entityType,
-    pagination = { page: 0, perPage: 20 }
+    pagination = { page: 0, perPage: 20 },
+    filters
   }) {
     const pattern = `${TABLE_SCORERS}:*`;
     const keys = await this.#db.scanKeys(pattern);
@@ -1663,13 +1679,14 @@ var ScoresUpstash = class extends ScoresStorage {
       if (!row || typeof row !== "object") return false;
       if (row.entityId !== entityId) return false;
       if (entityType && row.entityType !== entityType) return false;
+      if (!matchesTenancy(row, filters)) return false;
       return true;
     });
     const total = filtered.length;
     const perPage = normalizePerPage(perPageInput, 100);
     const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
     const end = perPageInput === false ? filtered.length : start + perPage;
-    const paged = filtered.slice(start, end);
+    const paged = [...filtered].sort(compareScoresByCreatedAtDesc).slice(start, end);
     const scores = paged.map((row) => transformScoreRow(row));
     return {
       scores,
@@ -1684,7 +1701,8 @@ var ScoresUpstash = class extends ScoresStorage {
   async listScoresBySpan({
     traceId,
     spanId,
-    pagination = { page: 0, perPage: 20 }
+    pagination = { page: 0, perPage: 20 },
+    filters
   }) {
     const pattern = `${TABLE_SCORERS}:*`;
     const keys = await this.#db.scanKeys(pattern);
@@ -1712,13 +1730,14 @@ var ScoresUpstash = class extends ScoresStorage {
       if (!row || typeof row !== "object") return false;
       if (row.traceId !== traceId) return false;
       if (row.spanId !== spanId) return false;
+      if (!matchesTenancy(row, filters)) return false;
       return true;
     });
     const total = filtered.length;
     const perPage = normalizePerPage(perPageInput, 100);
     const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
     const end = perPageInput === false ? filtered.length : start + perPage;
-    const paged = filtered.slice(start, end);
+    const paged = [...filtered].sort(compareScoresByCreatedAtDesc).slice(start, end);
     const scores = paged.map((row) => transformScoreRow(row));
     return {
       scores,