@mastra/cloudflare-d1 1.1.0 → 1.1.1

package/dist/index.js

@@ -1865,6 +1865,14 @@ var MemoryStorageD1 = class extends MemoryStorage {
     }
   }
 };
+function applyTenancyFilters(query, filters) {
+  if (filters?.organizationId !== void 0) {
+    query.andWhere("organizationId = ?", filters.organizationId);
+  }
+  if (filters?.projectId !== void 0) {
+    query.andWhere("projectId = ?", filters.projectId);
+  }
+}
 function transformScoreRow(row) {
   return transformScoreRow$1(row, {
     preferredTimestampFields: {
@@ -1881,6 +1889,11 @@ var ScoresStorageD1 = class extends ScoresStorage {
   }
   async init() {
     await this.#db.createTable({ tableName: TABLE_SCORERS, schema: TABLE_SCHEMAS[TABLE_SCORERS] });
+    await this.#db.alterTable({
+      tableName: TABLE_SCORERS,
+      schema: TABLE_SCHEMAS[TABLE_SCORERS],
+      ifNotExists: ["organizationId", "projectId", "batchId", "datasetId", "datasetItemId"]
+    });
   }
   async dangerouslyClearAll() {
     await this.#db.clearTable({ tableName: TABLE_SCORERS });
@@ -1969,7 +1982,8 @@ var ScoresStorageD1 = class extends ScoresStorage {
     entityId,
     entityType,
     source,
-    pagination
+    pagination,
+    filters
   }) {
     try {
       const { page, perPage: perPageInput } = pagination;
@@ -1986,6 +2000,7 @@ var ScoresStorageD1 = class extends ScoresStorage {
       if (source) {
         countQuery.andWhere("source = ?", source);
       }
+      applyTenancyFilters(countQuery, filters);
       const countResult = await this.#db.executeQuery(countQuery.build());
       const total = Array.isArray(countResult) ? Number(countResult?.[0]?.count ?? 0) : Number(countResult?.count ?? 0);
       if (total === 0) {
@@ -2011,7 +2026,8 @@ var ScoresStorageD1 = class extends ScoresStorage {
       if (source) {
         selectQuery.andWhere("source = ?", source);
       }
-      selectQuery.limit(limitValue).offset(start);
+      applyTenancyFilters(selectQuery, filters);
+      selectQuery.orderBy("createdAt", "DESC").limit(limitValue).offset(start);
       const { sql, params } = selectQuery.build();
       const results = await this.#db.executeQuery({ sql, params });
       const scores = Array.isArray(results) ? results.map(transformScoreRow) : [];
@@ -2037,7 +2053,8 @@ var ScoresStorageD1 = class extends ScoresStorage {
   }
   async listScoresByRunId({
     runId,
-    pagination
+    pagination,
+    filters
   }) {
     try {
       const { page, perPage: perPageInput } = pagination;
@@ -2045,6 +2062,7 @@ var ScoresStorageD1 = class extends ScoresStorage {
       const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
       const fullTableName = this.#db.getTableName(TABLE_SCORERS);
       const countQuery = createSqlBuilder().count().from(fullTableName).where("runId = ?", runId);
+      applyTenancyFilters(countQuery, filters);
       const countResult = await this.#db.executeQuery(countQuery.build());
       const total = Array.isArray(countResult) ? Number(countResult?.[0]?.count ?? 0) : Number(countResult?.count ?? 0);
       if (total === 0) {
@@ -2060,7 +2078,9 @@ var ScoresStorageD1 = class extends ScoresStorage {
       }
       const end = perPageInput === false ? total : start + perPage;
       const limitValue = perPageInput === false ? total : perPage;
-      const selectQuery = createSqlBuilder().select("*").from(fullTableName).where("runId = ?", runId).limit(limitValue).offset(start);
+      const selectQuery = createSqlBuilder().select("*").from(fullTableName).where("runId = ?", runId);
+      applyTenancyFilters(selectQuery, filters);
+      selectQuery.orderBy("createdAt", "DESC").limit(limitValue).offset(start);
       const { sql, params } = selectQuery.build();
       const results = await this.#db.executeQuery({ sql, params });
       const scores = Array.isArray(results) ? results.map(transformScoreRow) : [];
@@ -2087,7 +2107,8 @@ var ScoresStorageD1 = class extends ScoresStorage {
   async listScoresByEntityId({
     entityId,
     entityType,
-    pagination
+    pagination,
+    filters
   }) {
     try {
       const { page, perPage: perPageInput } = pagination;
@@ -2095,6 +2116,7 @@ var ScoresStorageD1 = class extends ScoresStorage {
       const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
       const fullTableName = this.#db.getTableName(TABLE_SCORERS);
       const countQuery = createSqlBuilder().count().from(fullTableName).where("entityId = ?", entityId).andWhere("entityType = ?", entityType);
+      applyTenancyFilters(countQuery, filters);
       const countResult = await this.#db.executeQuery(countQuery.build());
       const total = Array.isArray(countResult) ? Number(countResult?.[0]?.count ?? 0) : Number(countResult?.count ?? 0);
       if (total === 0) {
@@ -2110,7 +2132,9 @@ var ScoresStorageD1 = class extends ScoresStorage {
       }
       const end = perPageInput === false ? total : start + perPage;
       const limitValue = perPageInput === false ? total : perPage;
-      const selectQuery = createSqlBuilder().select("*").from(fullTableName).where("entityId = ?", entityId).andWhere("entityType = ?", entityType).limit(limitValue).offset(start);
+      const selectQuery = createSqlBuilder().select("*").from(fullTableName).where("entityId = ?", entityId).andWhere("entityType = ?", entityType);
+      applyTenancyFilters(selectQuery, filters);
+      selectQuery.orderBy("createdAt", "DESC").limit(limitValue).offset(start);
       const { sql, params } = selectQuery.build();
       const results = await this.#db.executeQuery({ sql, params });
       const scores = Array.isArray(results) ? results.map(transformScoreRow) : [];
@@ -2137,7 +2161,8 @@ var ScoresStorageD1 = class extends ScoresStorage {
   async listScoresBySpan({
     traceId,
     spanId,
-    pagination
+    pagination,
+    filters
   }) {
     try {
       const { page, perPage: perPageInput } = pagination;
@@ -2145,6 +2170,7 @@ var ScoresStorageD1 = class extends ScoresStorage {
       const { offset: start, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
       const fullTableName = this.#db.getTableName(TABLE_SCORERS);
       const countQuery = createSqlBuilder().count().from(fullTableName).where("traceId = ?", traceId).andWhere("spanId = ?", spanId);
+      applyTenancyFilters(countQuery, filters);
       const countResult = await this.#db.executeQuery(countQuery.build());
       const total = Array.isArray(countResult) ? Number(countResult?.[0]?.count ?? 0) : Number(countResult?.count ?? 0);
       if (total === 0) {
@@ -2160,7 +2186,9 @@ var ScoresStorageD1 = class extends ScoresStorage {
       }
       const end = perPageInput === false ? total : start + perPage;
       const limitValue = perPageInput === false ? total : perPage;
-      const selectQuery = createSqlBuilder().select("*").from(fullTableName).where("traceId = ?", traceId).andWhere("spanId = ?", spanId).orderBy("createdAt", "DESC").limit(limitValue).offset(start);
+      const selectQuery = createSqlBuilder().select("*").from(fullTableName).where("traceId = ?", traceId).andWhere("spanId = ?", spanId);
+      applyTenancyFilters(selectQuery, filters);
+      selectQuery.orderBy("createdAt", "DESC").limit(limitValue).offset(start);
       const { sql, params } = selectQuery.build();
       const results = await this.#db.executeQuery({ sql, params });
       const scores = Array.isArray(results) ? results.map(transformScoreRow) : [];