@mastra/mssql 1.0.0-beta.0 → 1.0.0-beta.1

package/dist/index.js

@@ -150,6 +150,18 @@ var MemoryMSSQL = class extends MemoryStorage {
   }
   async listThreadsByResourceId(args) {
     const { resourceId, page = 0, perPage: perPageInput, orderBy } = args;
+    if (page < 0) {
+      throw new MastraError({
+        id: "MASTRA_STORAGE_MSSQL_STORE_INVALID_PAGE",
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER,
+        text: "Page number must be non-negative",
+        details: {
+          resourceId,
+          page
+        }
+      });
+    }
     const perPage = normalizePerPage(perPageInput, 100);
     const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
     const { field, direction } = this.parseOrderBy(orderBy);
@@ -505,43 +517,59 @@ var MemoryMSSQL = class extends MemoryStorage {
         new Error("threadId must be a non-empty string")
       );
     }
+    if (page < 0) {
+      throw new MastraError({
+        id: "MASTRA_STORAGE_MSSQL_STORE_INVALID_PAGE",
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER,
+        text: "Page number must be non-negative",
+        details: {
+          threadId,
+          page
+        }
+      });
+    }
     const perPage = normalizePerPage(perPageInput, 40);
     const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
     try {
       const { field, direction } = this.parseOrderBy(orderBy, "ASC");
-      const orderByStatement = `ORDER BY [${field}] ${direction}`;
-      const selectStatement = `SELECT seq_id, id, content, role, type, [createdAt], thread_id AS threadId, resourceId`;
+      const orderByStatement = `ORDER BY [${field}] ${direction}, [seq_id] ${direction}`;
       const tableName = getTableName({ indexName: TABLE_MESSAGES, schemaName: getSchemaName(this.schema) });
-      const conditions = ["[thread_id] = @threadId"];
-      const request = this.pool.request();
-      request.input("threadId", threadId);
-      if (resourceId) {
-        conditions.push("[resourceId] = @resourceId");
-        request.input("resourceId", resourceId);
-      }
-      if (filter?.dateRange?.start) {
-        conditions.push("[createdAt] >= @fromDate");
-        request.input("fromDate", filter.dateRange.start);
-      }
-      if (filter?.dateRange?.end) {
-        conditions.push("[createdAt] <= @toDate");
-        request.input("toDate", filter.dateRange.end);
-      }
-      const whereClause = `WHERE ${conditions.join(" AND ")}`;
-      const countQuery = `SELECT COUNT(*) as total FROM ${tableName} ${whereClause}`;
-      const countResult = await request.query(countQuery);
+      const baseQuery = `SELECT seq_id, id, content, role, type, [createdAt], thread_id AS threadId, resourceId FROM ${tableName}`;
+      const filters = {
+        thread_id: threadId,
+        ...resourceId ? { resourceId } : {},
+        ...buildDateRangeFilter(filter?.dateRange, "createdAt")
+      };
+      const { sql: actualWhereClause = "", params: whereParams } = prepareWhereClause(
+        filters);
+      const bindWhereParams = (req) => {
+        Object.entries(whereParams).forEach(([paramName, paramValue]) => req.input(paramName, paramValue));
+      };
+      const countRequest = this.pool.request();
+      bindWhereParams(countRequest);
+      const countResult = await countRequest.query(`SELECT COUNT(*) as total FROM ${tableName}${actualWhereClause}`);
       const total = parseInt(countResult.recordset[0]?.total, 10) || 0;
-      const limitValue = perPageInput === false ? total : perPage;
-      const dataQuery = `${selectStatement} FROM ${tableName} ${whereClause} ${orderByStatement} OFFSET @offset ROWS FETCH NEXT @limit ROWS ONLY`;
-      request.input("offset", offset);
-      if (limitValue > 2147483647) {
-        request.input("limit", sql2.BigInt, limitValue);
-      } else {
-        request.input("limit", limitValue);
-      }
-      const rowsResult = await request.query(dataQuery);
-      const rows = rowsResult.recordset || [];
-      const messages = [...rows];
+      const fetchBaseMessages = async () => {
+        const request = this.pool.request();
+        bindWhereParams(request);
+        if (perPageInput === false) {
+          const result2 = await request.query(`${baseQuery}${actualWhereClause} ${orderByStatement}`);
+          return result2.recordset || [];
+        }
+        request.input("offset", offset);
+        request.input("limit", perPage > 2147483647 ? sql2.BigInt : sql2.Int, perPage);
+        const result = await request.query(
+          `${baseQuery}${actualWhereClause} ${orderByStatement} OFFSET @offset ROWS FETCH NEXT @limit ROWS ONLY`
+        );
+        return result.recordset || [];
+      };
+      const baseRows = perPage === 0 ? [] : await fetchBaseMessages();
+      const messages = [...baseRows];
+      const seqById = /* @__PURE__ */ new Map();
+      messages.forEach((msg) => {
+        if (typeof msg.seq_id === "number") seqById.set(msg.id, msg.seq_id);
+      });
       if (total === 0 && messages.length === 0 && (!include || include.length === 0)) {
         return {
           messages: [],
@@ -551,28 +579,33 @@ var MemoryMSSQL = class extends MemoryStorage {
           hasMore: false
         };
       }
-      const messageIds = new Set(messages.map((m) => m.id));
-      if (include && include.length > 0) {
+      if (include?.length) {
+        const messageIds = new Set(messages.map((m) => m.id));
         const includeMessages = await this._getIncludedMessages({ threadId, include });
-        if (includeMessages) {
-          for (const includeMsg of includeMessages) {
-            if (!messageIds.has(includeMsg.id)) {
-              messages.push(includeMsg);
-              messageIds.add(includeMsg.id);
-            }
+        includeMessages?.forEach((msg) => {
+          if (!messageIds.has(msg.id)) {
+            messages.push(msg);
+            messageIds.add(msg.id);
+            if (typeof msg.seq_id === "number") seqById.set(msg.id, msg.seq_id);
           }
-        }
+        });
       }
       const parsed = this._parseAndFormatMessages(messages, "v2");
-      let finalMessages = parsed;
-      finalMessages = finalMessages.sort((a, b) => {
-        const aValue = field === "createdAt" ? new Date(a.createdAt).getTime() : a[field];
-        const bValue = field === "createdAt" ? new Date(b.createdAt).getTime() : b[field];
-        return direction === "ASC" ? aValue - bValue : bValue - aValue;
+      const mult = direction === "ASC" ? 1 : -1;
+      const finalMessages = parsed.sort((a, b) => {
+        const aVal = field === "createdAt" ? new Date(a.createdAt).getTime() : a[field];
+        const bVal = field === "createdAt" ? new Date(b.createdAt).getTime() : b[field];
+        if (aVal == null || bVal == null) {
+          return aVal == null && bVal == null ? a.id.localeCompare(b.id) : aVal == null ? 1 : -1;
+        }
+        const diff = (typeof aVal === "number" && typeof bVal === "number" ? aVal - bVal : String(aVal).localeCompare(String(bVal))) * mult;
+        if (diff !== 0) return diff;
+        const seqA = seqById.get(a.id);
+        const seqB = seqById.get(b.id);
+        return seqA != null && seqB != null ? (seqA - seqB) * mult : a.id.localeCompare(b.id);
       });
-      const returnedThreadMessageIds = new Set(finalMessages.filter((m) => m.threadId === threadId).map((m) => m.id));
-      const allThreadMessagesReturned = returnedThreadMessageIds.size >= total;
-      const hasMore = perPageInput !== false && !allThreadMessagesReturned && offset + perPage < total;
+      const returnedThreadMessageCount = finalMessages.filter((m) => m.threadId === threadId).length;
+      const hasMore = perPageInput !== false && returnedThreadMessageCount < total && offset + perPage < total;
       return {
         messages: finalMessages,
         total,
@@ -1679,6 +1712,20 @@ ${columns}
       return value ? 1 : 0;
     }
     if (columnSchema?.type === "jsonb") {
+      if (typeof value === "string") {
+        const trimmed = value.trim();
+        if (trimmed.length > 0) {
+          try {
+            JSON.parse(trimmed);
+            return trimmed;
+          } catch {
+          }
+        }
+        return JSON.stringify(value);
+      }
+      if (typeof value === "bigint") {
+        return value.toString();
+      }
       return JSON.stringify(value);
     }
     if (typeof value === "object") {