@mastra/mysql 0.4.0 → 0.5.0-alpha.0

package/dist/index.js

@@ -1,5 +1,5 @@
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { StoreOperations, TABLE_CONFIGS, TABLE_WORKFLOW_SNAPSHOT, TABLE_SPANS, AgentsStorage, TABLE_AGENTS, TABLE_AGENT_VERSIONS, AGENTS_SCHEMA, AGENT_VERSIONS_SCHEMA, createStorageErrorId, normalizePerPage, calculatePagination, BlobStore, SKILL_BLOBS_SCHEMA, TABLE_SKILL_BLOBS, DatasetsStorage, TABLE_DATASETS, TABLE_DATASET_ITEMS, TABLE_DATASET_VERSIONS, DATASETS_SCHEMA, DATASET_ITEMS_SCHEMA, DATASET_VERSIONS_SCHEMA, TABLE_EXPERIMENTS, TABLE_EXPERIMENT_RESULTS, hasErrorCode, ExperimentsStorage, EXPERIMENTS_SCHEMA, EXPERIMENT_RESULTS_SCHEMA, MCPClientsStorage, TABLE_MCP_CLIENTS, TABLE_MCP_CLIENT_VERSIONS, MCP_CLIENTS_SCHEMA, MCP_CLIENT_VERSIONS_SCHEMA, MCPServersStorage, TABLE_MCP_SERVERS, TABLE_MCP_SERVER_VERSIONS, MCP_SERVERS_SCHEMA, MCP_SERVER_VERSIONS_SCHEMA, MemoryStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES, TABLE_SCHEMAS, OBSERVATIONAL_MEMORY_TABLE_SCHEMA, ObservabilityStorage, SPAN_SCHEMA, listTracesArgsSchema, TraceStatus, toTraceSpans, PromptBlocksStorage, TABLE_PROMPT_BLOCKS, TABLE_PROMPT_BLOCK_VERSIONS, PROMPT_BLOCKS_SCHEMA, PROMPT_BLOCK_VERSIONS_SCHEMA, ScorerDefinitionsStorage, TABLE_SCORER_DEFINITIONS, TABLE_SCORER_DEFINITION_VERSIONS, SCORER_DEFINITIONS_SCHEMA, SCORER_DEFINITION_VERSIONS_SCHEMA, ScoresStorage, TABLE_SCORERS, SCORERS_SCHEMA, SkillsStorage, TABLE_SKILLS, TABLE_SKILL_VERSIONS, SKILLS_SCHEMA, SKILL_VERSIONS_SCHEMA, WorkflowsStorage, WorkspacesStorage, TABLE_WORKSPACES, TABLE_WORKSPACE_VERSIONS, WORKSPACES_SCHEMA, WORKSPACE_VERSIONS_SCHEMA, MastraCompositeStore, TABLE_FAVORITES, BackgroundTasksStorage, TABLE_BACKGROUND_TASKS, ChannelsStorage, TABLE_CHANNEL_INSTALLATIONS, TABLE_CHANNEL_CONFIG, FavoritesStorage, FAVORITES_SCHEMA, SchedulesStorage, TABLE_SCHEDULES, TABLE_SCHEDULE_TRIGGERS, ToolProviderConnectionsStorage, TABLE_TOOL_PROVIDER_CONNECTIONS, TOOL_PROVIDER_CONNECTIONS_SCHEMA, normalizeScheduleTarget } from '@mastra/core/storage';
+import { StoreOperations, TABLE_CONFIGS, TABLE_WORKFLOW_SNAPSHOT, TABLE_SPANS, AgentsStorage, TABLE_AGENTS, TABLE_AGENT_VERSIONS, AGENTS_SCHEMA, AGENT_VERSIONS_SCHEMA, createStorageErrorId, normalizePerPage, calculatePagination, BlobStore, SKILL_BLOBS_SCHEMA, TABLE_SKILL_BLOBS, DatasetsStorage, TABLE_DATASETS, TABLE_DATASET_ITEMS, TABLE_DATASET_VERSIONS, DATASETS_SCHEMA, DATASET_ITEMS_SCHEMA, DATASET_VERSIONS_SCHEMA, TABLE_EXPERIMENTS, TABLE_EXPERIMENT_RESULTS, hasErrorCode, ExperimentsStorage, EXPERIMENTS_SCHEMA, EXPERIMENT_RESULTS_SCHEMA, MCPClientsStorage, TABLE_MCP_CLIENTS, TABLE_MCP_CLIENT_VERSIONS, MCP_CLIENTS_SCHEMA, MCP_CLIENT_VERSIONS_SCHEMA, MCPServersStorage, TABLE_MCP_SERVERS, TABLE_MCP_SERVER_VERSIONS, MCP_SERVERS_SCHEMA, MCP_SERVER_VERSIONS_SCHEMA, MemoryStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES, TABLE_SCHEMAS, OBSERVATIONAL_MEMORY_TABLE_SCHEMA, validateStorageMetadataFilter, ObservabilityStorage, SPAN_SCHEMA, listTracesArgsSchema, TraceStatus, toTraceSpans, PromptBlocksStorage, TABLE_PROMPT_BLOCKS, TABLE_PROMPT_BLOCK_VERSIONS, PROMPT_BLOCKS_SCHEMA, PROMPT_BLOCK_VERSIONS_SCHEMA, ScorerDefinitionsStorage, TABLE_SCORER_DEFINITIONS, TABLE_SCORER_DEFINITION_VERSIONS, SCORER_DEFINITIONS_SCHEMA, SCORER_DEFINITION_VERSIONS_SCHEMA, ScoresStorage, TABLE_SCORERS, SCORERS_SCHEMA, SkillsStorage, TABLE_SKILLS, TABLE_SKILL_VERSIONS, SKILLS_SCHEMA, SKILL_VERSIONS_SCHEMA, WorkflowsStorage, WorkspacesStorage, TABLE_WORKSPACES, TABLE_WORKSPACE_VERSIONS, WORKSPACES_SCHEMA, WORKSPACE_VERSIONS_SCHEMA, MastraCompositeStore, TABLE_FAVORITES, BackgroundTasksStorage, TABLE_BACKGROUND_TASKS, ChannelsStorage, TABLE_CHANNEL_INSTALLATIONS, TABLE_CHANNEL_CONFIG, FavoritesStorage, FAVORITES_SCHEMA, SchedulesStorage, TABLE_SCHEDULES, TABLE_SCHEDULE_TRIGGERS, ToolProviderConnectionsStorage, TABLE_TOOL_PROVIDER_CONNECTIONS, TOOL_PROVIDER_CONNECTIONS_SCHEMA, normalizeScheduleTarget } from '@mastra/core/storage';
 import { createPool } from 'mysql2/promise';
 import { parseSqlIdentifier } from '@mastra/core/utils';
 import { randomUUID } from 'crypto';
@@ -5214,6 +5214,22 @@ function parseJSON3(value) {
     return null;
   }
 }
+function addMySQLMessageMetadataFilter(conditions, params, metadataFilter) {
+  if (!metadataFilter) return;
+  for (const [key, value] of Object.entries(metadataFilter)) {
+    const path = `$.metadata.${key}`;
+    conditions.push(`JSON_VALID(${quoteIdentifier("content", "column name")})`);
+    conditions.push(`JSON_CONTAINS_PATH(${quoteIdentifier("content", "column name")}, 'one', ?)`);
+    params.push(path);
+    if (value === null) {
+      conditions.push(`JSON_TYPE(JSON_EXTRACT(${quoteIdentifier("content", "column name")}, ?)) = 'NULL'`);
+      params.push(path);
+    } else {
+      conditions.push(`JSON_EXTRACT(${quoteIdentifier("content", "column name")}, ?) = CAST(? AS JSON)`);
+      params.push(path, JSON.stringify(value));
+    }
+  }
+}
 var MemoryMySQL = class _MemoryMySQL extends MemoryStorage {
   supportsObservationalMemory = true;
   pool;
@@ -6069,6 +6085,7 @@ var MemoryMySQL = class _MemoryMySQL extends MemoryStorage {
     const { threadId, resourceId, filter, orderBy, page = 0, perPage: perPageInput } = args;
     const selectBy = args.selectBy;
     const include = args.include ?? selectBy?.include;
+    const metadataFilter = validateStorageMetadataFilter(filter?.metadata);
     const threadIds = Array.isArray(threadId) ? threadId : [threadId];
     if (threadIds.length === 0 || threadIds.some((id) => !id.trim())) {
       throw emitValidationError("threadId must be a non-empty string or array of non-empty strings");
@@ -6115,6 +6132,7 @@ var MemoryMySQL = class _MemoryMySQL extends MemoryStorage {
         conditions.push(`${quoteIdentifier("createdAt", "column name")} ${endOp} ?`);
         params.push(transformToSqlValue(filter.dateRange.end));
       }
+      addMySQLMessageMetadataFilter(conditions, params, metadataFilter);
       if (selectBy?.vectorSearchString) {
         conditions.push(`${quoteIdentifier("content", "column name")} LIKE ?`);
         params.push(`%${selectBy.vectorSearchString}%`);
@@ -6196,7 +6214,7 @@ var MemoryMySQL = class _MemoryMySQL extends MemoryStorage {
       const mainThreadMessageCount = messages.filter(
         (msg) => msg.threadId !== void 0 && threadIdSet.has(msg.threadId)
       ).length;
-      const hasMore = include && include.length ? mainThreadMessageCount >= total ? false : baseHasMore : baseHasMore;
+      const hasMore = metadataFilter || !include?.length || mainThreadMessageCount < total ? baseHasMore : false;
       return {
         messages,
         total,
@@ -6225,6 +6243,7 @@ var MemoryMySQL = class _MemoryMySQL extends MemoryStorage {
   }
   async listMessagesByResourceId(args) {
     const { resourceId, include, filter, perPage: perPageInput, page = 0, orderBy } = args;
+    const metadataFilter = validateStorageMetadataFilter(filter?.metadata);
     if (!resourceId || typeof resourceId !== "string" || resourceId.trim().length === 0) {
       throw new MastraError(
         {
@@ -6265,6 +6284,7 @@ var MemoryMySQL = class _MemoryMySQL extends MemoryStorage {
         conditions.push(`${quoteIdentifier("createdAt", "column name")} ${endOp} ?`);
         params.push(transformToSqlValue(filter.dateRange.end));
       }
+      addMySQLMessageMetadataFilter(conditions, params, metadataFilter);
       const whereSql = `WHERE ${conditions.join(" AND ")}`;
       const tableName = formatTableName(TABLE_MESSAGES);
       const [countRows] = await this.pool.execute(