@mastra/mssql 0.3.6 → 0.3.7-alpha.0

package/dist/index.js

@@ -461,6 +461,7 @@ var MemoryMSSQL = class extends MemoryStorage {
     selectBy,
     orderByStatement
   }) {
+    if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
     const include = selectBy?.include;
     if (!include) return null;
     const unionQueries = [];
@@ -532,11 +533,12 @@ var MemoryMSSQL = class extends MemoryStorage {
     return dedupedRows;
   }
   async getMessages(args) {
-    const { threadId, format, selectBy } = args;
+    const { threadId, resourceId, format, selectBy } = args;
     const selectStatement = `SELECT seq_id, id, content, role, type, [createdAt], thread_id AS threadId, resourceId`;
     const orderByStatement = `ORDER BY [seq_id] DESC`;
     const limit = resolveMessageLimit({ last: selectBy?.last, defaultLimit: 40 });
     try {
+      if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
       let rows = [];
       const include = selectBy?.include || [];
       if (include?.length) {
@@ -574,7 +576,8 @@ var MemoryMSSQL = class extends MemoryStorage {
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
-            threadId
+            threadId,
+            resourceId: resourceId ?? ""
           }
         },
         error
@@ -625,29 +628,24 @@ var MemoryMSSQL = class extends MemoryStorage {
     }
   }
   async getMessagesPaginated(args) {
-    const { threadId, selectBy } = args;
-    const { page = 0, perPage: perPageInput } = selectBy?.pagination || {};
-    const orderByStatement = `ORDER BY [seq_id] DESC`;
-    if (selectBy?.include?.length) {
-      await this._getIncludedMessages({ threadId, selectBy, orderByStatement });
-    }
+    const { threadId, resourceId, format, selectBy } = args;
+    const { page = 0, perPage: perPageInput, dateRange } = selectBy?.pagination || {};
     try {
-      const { threadId: threadId2, format, selectBy: selectBy2 } = args;
-      const { page: page2 = 0, perPage: perPageInput2, dateRange } = selectBy2?.pagination || {};
+      if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
       const fromDate = dateRange?.start;
       const toDate = dateRange?.end;
       const selectStatement = `SELECT seq_id, id, content, role, type, [createdAt], thread_id AS threadId, resourceId`;
-      const orderByStatement2 = `ORDER BY [seq_id] DESC`;
-      let messages2 = [];
-      if (selectBy2?.include?.length) {
-        const includeMessages = await this._getIncludedMessages({ threadId: threadId2, selectBy: selectBy2, orderByStatement: orderByStatement2 });
-        if (includeMessages) messages2.push(...includeMessages);
+      const orderByStatement = `ORDER BY [seq_id] DESC`;
+      let messages = [];
+      if (selectBy?.include?.length) {
+        const includeMessages = await this._getIncludedMessages({ threadId, selectBy, orderByStatement });
+        if (includeMessages) messages.push(...includeMessages);
       }
-      const perPage = perPageInput2 !== void 0 ? perPageInput2 : resolveMessageLimit({ last: selectBy2?.last, defaultLimit: 40 });
-      const currentOffset = page2 * perPage;
+      const perPage = perPageInput !== void 0 ? perPageInput : resolveMessageLimit({ last: selectBy?.last, defaultLimit: 40 });
+      const currentOffset = page * perPage;
       const conditions = ["[thread_id] = @threadId"];
       const request = this.pool.request();
-      request.input("threadId", threadId2);
+      request.input("threadId", threadId);
       if (fromDate instanceof Date && !isNaN(fromDate.getTime())) {
         conditions.push("[createdAt] >= @fromDate");
         request.input("fromDate", fromDate.toISOString());
@@ -660,35 +658,35 @@ var MemoryMSSQL = class extends MemoryStorage {
       const countQuery = `SELECT COUNT(*) as total FROM ${getTableName({ indexName: TABLE_MESSAGES, schemaName: getSchemaName(this.schema) })} ${whereClause}`;
       const countResult = await request.query(countQuery);
       const total = parseInt(countResult.recordset[0]?.total, 10) || 0;
-      if (total === 0 && messages2.length > 0) {
-        const parsedIncluded = this._parseAndFormatMessages(messages2, format);
+      if (total === 0 && messages.length > 0) {
+        const parsedIncluded = this._parseAndFormatMessages(messages, format);
         return {
           messages: parsedIncluded,
           total: parsedIncluded.length,
-          page: page2,
+          page,
           perPage,
           hasMore: false
         };
       }
-      const excludeIds = messages2.map((m) => m.id);
+      const excludeIds = messages.map((m) => m.id);
       if (excludeIds.length > 0) {
         const excludeParams = excludeIds.map((_, idx) => `@id${idx}`);
         conditions.push(`id NOT IN (${excludeParams.join(", ")})`);
         excludeIds.forEach((id, idx) => request.input(`id${idx}`, id));
       }
       const finalWhereClause = `WHERE ${conditions.join(" AND ")}`;
-      const dataQuery = `${selectStatement} FROM ${getTableName({ indexName: TABLE_MESSAGES, schemaName: getSchemaName(this.schema) })} ${finalWhereClause} ${orderByStatement2} OFFSET @offset ROWS FETCH NEXT @limit ROWS ONLY`;
+      const dataQuery = `${selectStatement} FROM ${getTableName({ indexName: TABLE_MESSAGES, schemaName: getSchemaName(this.schema) })} ${finalWhereClause} ${orderByStatement} OFFSET @offset ROWS FETCH NEXT @limit ROWS ONLY`;
       request.input("offset", currentOffset);
       request.input("limit", perPage);
       const rowsResult = await request.query(dataQuery);
       const rows = rowsResult.recordset || [];
       rows.sort((a, b) => a.seq_id - b.seq_id);
-      messages2.push(...rows);
-      const parsed = this._parseAndFormatMessages(messages2, format);
+      messages.push(...rows);
+      const parsed = this._parseAndFormatMessages(messages, format);
       return {
         messages: parsed,
         total: total + excludeIds.length,
-        page: page2,
+        page,
         perPage,
         hasMore: currentOffset + rows.length < total
       };
@@ -700,6 +698,7 @@ var MemoryMSSQL = class extends MemoryStorage {
           category: ErrorCategory.THIRD_PARTY,
           details: {
             threadId,
+            resourceId: resourceId ?? "",
             page
           }
         },