@dyrected/db-mysql 2.15.0 → 2.17.0

package/dist/index.cjs

@@ -37,6 +37,22 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 var import_core = require("@dyrected/core");
 var import_promise = __toESM(require("mysql2/promise"), 1);
+function parseMysqlDuplicateKey(message) {
+  const match = message.match(/Duplicate entry '(.*)' for key '(?:[^.]*\.)?(.*)'/);
+  if (!match) return {};
+  const [, value, keyName] = match;
+  let field = keyName;
+  if (keyName === "PRIMARY") {
+    field = "id";
+  } else if (keyName.startsWith("uniq_") || keyName.startsWith("idx_")) {
+    const parts = keyName.split("_");
+    field = parts[parts.length - 1];
+  }
+  return { field, value };
+}
+function isNumericOp(val) {
+  return val !== null && typeof val === "object" && !Array.isArray(val) && ("increment" in val || "decrement" in val);
+}
 var MYSQL_CLIENT_CACHE_KEY = "__dyrectedMysqlClientCache";
 function getSharedMysqlClientCache() {
   const globalScope = globalThis;
@@ -69,7 +85,9 @@ var MysqlAdapter = class {
   inTransaction = false;
   tableLocks = /* @__PURE__ */ new Map();
   ensuredTables = /* @__PURE__ */ new Set();
+  failedIndexes = /* @__PURE__ */ new Set();
   tableColumnsCache = /* @__PURE__ */ new Map();
+  collectionConfigs = /* @__PURE__ */ new Map();
   constructor(config) {
     this.config = config;
   }
@@ -204,7 +222,7 @@ FIX INSTRUCTIONS:
           `);
           await pool.query(`
             CREATE TABLE IF NOT EXISTS _dyrected_ai_threads (
-              id VARCHAR(36) PRIMARY KEY,
+              id VARCHAR(191) PRIMARY KEY,
               project_id VARCHAR(255) NOT NULL,
               user_id VARCHAR(255) NOT NULL,
               title TEXT,
@@ -215,8 +233,8 @@ FIX INSTRUCTIONS:
           `);
           await pool.query(`
             CREATE TABLE IF NOT EXISTS _dyrected_ai_messages (
-              id VARCHAR(36) PRIMARY KEY,
-              thread_id VARCHAR(36) NOT NULL,
+              id VARCHAR(191) PRIMARY KEY,
+              thread_id VARCHAR(191) NOT NULL,
               role VARCHAR(50) NOT NULL,
               content LONGTEXT NOT NULL,
               created_at DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3),
@@ -240,12 +258,22 @@ FIX INSTRUCTIONS:
       throw error;
     }
   }
+  handleDatabaseError(err) {
+    if (err && (err.errno === 1062 || err.code === "ER_DUP_ENTRY" || err.message?.includes("Duplicate entry"))) {
+      const { field, value } = parseMysqlDuplicateKey(err.message || "");
+      throw new import_core.DuplicateKeyError(
+        `Duplicate entry${value ? ` '${value}'` : ""} for unique key${field ? ` '${field}'` : ""}`,
+        { field, value }
+      );
+    }
+    this.handleConnectionError(err);
+  }
   async query(sql, params) {
     await this.ensureInitialized();
     try {
       return await this.pool.query(sql, params);
     } catch (err) {
-      this.handleConnectionError(err);
+      this.handleDatabaseError(err);
     }
   }
   async execute(sql, params) {
@@ -253,7 +281,7 @@ FIX INSTRUCTIONS:
     try {
       return await this.pool.execute(sql, params);
     } catch (err) {
-      this.handleConnectionError(err);
+      this.handleDatabaseError(err);
     }
   }
   getTableName(slug) {
@@ -271,7 +299,7 @@ FIX INSTRUCTIONS:
     this.tableColumnsCache.set(tableName, existingCols);
     return existingCols;
   }
-  async ensureTable(slug, fields = []) {
+  async ensureTable(slug, fields = [], indexes = []) {
     if (slug === "_dyrected_ai_threads" || slug === "_dyrected_ai_messages") {
       return;
     }
@@ -295,20 +323,39 @@ FIX INSTRUCTIONS:
       const tableName = this.getTableName(slug);
       await this.query(`
         CREATE TABLE IF NOT EXISTS \`${tableName}\` (
-          id VARCHAR(36) PRIMARY KEY,
+          id VARCHAR(191) PRIMARY KEY,
           data JSON NOT NULL,
           created_at DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3),
           updated_at DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)
         )
       `);
       const existingCols = await this.getTableColumns(tableName);
+      try {
+        const [idCols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\` WHERE Field = 'id'`);
+        const idCol = idCols?.[0];
+        if (idCol && typeof idCol.Type === "string" && idCol.Type.toLowerCase().includes("varchar(36)")) {
+          await this.query(`ALTER TABLE \`${tableName}\` MODIFY COLUMN id VARCHAR(191) NOT NULL`);
+        }
+      } catch {
+      }
+      const indexedFields = /* @__PURE__ */ new Set();
+      if (Array.isArray(indexes)) {
+        for (const idx of indexes) {
+          if (Array.isArray(idx.fields)) {
+            for (const f of idx.fields) indexedFields.add(f);
+          }
+        }
+      }
       for (const field of fields) {
-        if (field.promoted && !existingCols.includes(field.name)) {
+        const shouldPromote = field.promoted || field.unique || indexedFields.has(field.name);
+        if (shouldPromote && !existingCols.includes(field.name)) {
           console.log(`[dyrected/mysql] Promoting field "${field.name}" to column in ${tableName}`);
-          let sqlType = "TEXT";
+          const isUniqueOrIndexed = field.unique || indexedFields.has(field.name);
+          let sqlType = isUniqueOrIndexed ? "VARCHAR(191)" : "TEXT";
           if (field.type === "number") sqlType = "DECIMAL(19,4)";
           if (field.type === "boolean") sqlType = "TINYINT(1)";
           if (field.type === "date" || field.type === "datetime") sqlType = "DATETIME(3)";
+          if (field.type === "textarea" || field.type === "richText" || field.type === "json") sqlType = "LONGTEXT";
           try {
             await this.query(`ALTER TABLE \`${tableName}\` ADD COLUMN \`${field.name}\` ${sqlType}`);
             existingCols.push(field.name);
@@ -336,6 +383,75 @@ FIX INSTRUCTIONS:
           }
         }
       }
+      const rawIndices = await this.query(`SHOW INDEX FROM \`${tableName}\``);
+      const existingIndicesRows = Array.isArray(rawIndices?.[0]) ? rawIndices[0] : Array.isArray(rawIndices) ? rawIndices : [];
+      const existingIndexNames = new Set(existingIndicesRows.map((r) => r?.Key_name).filter(Boolean));
+      for (const field of fields) {
+        if (field.unique) {
+          const idxName = `uniq_${tableName}_${field.name}`;
+          if (!existingIndexNames.has(idxName) && !existingIndexNames.has(field.name) && !this.failedIndexes.has(idxName)) {
+            try {
+              const [colInfoRows] = await this.query(`SHOW COLUMNS FROM \`${tableName}\` WHERE Field = ?`, [field.name]);
+              const colType = colInfoRows?.[0]?.Type?.toLowerCase() || "";
+              if (colType.includes("text")) {
+                await this.query(`ALTER TABLE \`${tableName}\` MODIFY COLUMN \`${field.name}\` VARCHAR(191)`);
+              }
+            } catch {
+            }
+            try {
+              await this.query(`ALTER TABLE \`${tableName}\` ADD UNIQUE INDEX \`${idxName}\` (\`${field.name}\`)`);
+              existingIndexNames.add(idxName);
+            } catch (err) {
+              if (err.errno !== 1061 && err.code !== "ER_DUP_KEYNAME") {
+                this.failedIndexes.add(idxName);
+                if (err.errno === 1062 || err.code === "ER_DUP_ENTRY") {
+                  console.warn(
+                    `[dyrected/mysql] Could not create unique index ${idxName} on ${tableName} because duplicate values already exist: ${err.message}. To enforce uniqueness, remove duplicate records.`
+                  );
+                } else {
+                  console.warn(`[dyrected/mysql] Could not create unique index ${idxName} on ${tableName}:`, err.message);
+                }
+              }
+            }
+          }
+        }
+      }
+      if (Array.isArray(indexes)) {
+        for (const idx of indexes) {
+          if (!Array.isArray(idx.fields) || idx.fields.length === 0) continue;
+          const isUnique = Boolean(idx.unique);
+          const idxName = idx.name || `${isUnique ? "uniq" : "idx"}_${tableName}_${idx.fields.join("_")}`;
+          if (!existingIndexNames.has(idxName) && !this.failedIndexes.has(idxName)) {
+            for (const fName of idx.fields) {
+              try {
+                const [colInfoRows] = await this.query(`SHOW COLUMNS FROM \`${tableName}\` WHERE Field = ?`, [fName]);
+                const colType = colInfoRows?.[0]?.Type?.toLowerCase() || "";
+                if (colType.includes("text")) {
+                  await this.query(`ALTER TABLE \`${tableName}\` MODIFY COLUMN \`${fName}\` VARCHAR(191)`);
+                }
+              } catch {
+              }
+            }
+            const uniqueKeyword = isUnique ? "UNIQUE " : "";
+            const colList = idx.fields.map((f) => `\`${f.replace(/`/g, "``")}\``).join(", ");
+            try {
+              await this.query(`ALTER TABLE \`${tableName}\` ADD ${uniqueKeyword}INDEX \`${idxName}\` (${colList})`);
+              existingIndexNames.add(idxName);
+            } catch (err) {
+              if (err.errno !== 1061 && err.code !== "ER_DUP_KEYNAME") {
+                this.failedIndexes.add(idxName);
+                if (err.errno === 1062 || err.code === "ER_DUP_ENTRY") {
+                  console.warn(
+                    `[dyrected/mysql] Could not create ${isUnique ? "unique " : ""}index ${idxName} on ${tableName} because duplicate values already exist: ${err.message}. To enforce uniqueness, remove duplicate records.`
+                  );
+                } else {
+                  console.warn(`[dyrected/mysql] Could not create index ${idxName} on ${tableName}:`, err.message);
+                }
+              }
+            }
+          }
+        }
+      }
       this.ensuredTables.add(slug);
       resolveLock();
     } catch (err) {
@@ -358,8 +474,9 @@ FIX INSTRUCTIONS:
       const result = (0, import_core.parseSqlWhere)(
         args.where,
         (field) => {
-          if (field === "createdAt") return "`created_at`";
-          if (field === "updatedAt") return "`updated_at`";
+          if (field === "id") return "`id`";
+          if (field === "createdAt" || field === "created_at") return "`created_at`";
+          if (field === "updatedAt" || field === "updated_at") return "`updated_at`";
           if (existingCols.includes(field) && !["id", "data"].includes(field)) {
             return `\`${field}\``;
           }
@@ -371,21 +488,32 @@ FIX INSTRUCTIONS:
       whereParams = result.params;
     }
     const sort = normalizeMysqlSort(args.sort, existingCols);
+    const lock = this.inTransaction || args.lock === "for-update" ? " FOR UPDATE" : "";
     const [countRows] = await this.query(
       `SELECT COUNT(*) AS total FROM \`${tableName}\` ${whereSql}`,
       whereParams
     );
     const total = Number(countRows[0].total);
     const [rows] = await this.query(
-      `SELECT * FROM \`${tableName}\` ${whereSql} ORDER BY ${sort} LIMIT ? OFFSET ?`,
+      `SELECT * FROM \`${tableName}\` ${whereSql} ORDER BY ${sort} LIMIT ? OFFSET ?${lock}`,
       [...whereParams, limit, offset]
     );
-    const docs = rows.map((r) => ({
-      id: r.id,
-      ...JSON.parse(typeof r.data === "string" ? r.data : JSON.stringify(r.data)),
-      createdAt: r.created_at,
-      updatedAt: r.updated_at
-    }));
+    const docs = rows.map((r) => {
+      const parsedData = JSON.parse(typeof r.data === "string" ? r.data : JSON.stringify(r.data));
+      const promotedOverlay = {};
+      for (const col of existingCols) {
+        if (!["id", "data", "created_at", "updated_at"].includes(col) && r[col] !== void 0 && r[col] !== null) {
+          promotedOverlay[col] = r[col];
+        }
+      }
+      return {
+        id: r.id,
+        ...parsedData,
+        ...promotedOverlay,
+        createdAt: r.created_at,
+        updatedAt: r.updated_at
+      };
+    });
     const totalPages = Math.ceil(total / limit);
     return {
       docs,
@@ -400,13 +528,22 @@ FIX INSTRUCTIONS:
   async findOne(params) {
     if (!this.inTransaction) await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
-    const lock = this.inTransaction ? " FOR UPDATE" : "";
+    const lock = this.inTransaction || params.lock === "for-update" ? " FOR UPDATE" : "";
     const [rows] = await this.query(`SELECT * FROM \`${tableName}\` WHERE id = ?${lock}`, [params.id]);
     const row = rows[0];
     if (!row) return null;
+    const parsedData = JSON.parse(typeof row.data === "string" ? row.data : JSON.stringify(row.data));
+    const existingCols = await this.getTableColumns(tableName);
+    const promotedOverlay = {};
+    for (const col of existingCols) {
+      if (!["id", "data", "created_at", "updated_at"].includes(col) && row[col] !== void 0 && row[col] !== null) {
+        promotedOverlay[col] = row[col];
+      }
+    }
     return {
       id: row.id,
-      ...JSON.parse(typeof row.data === "string" ? row.data : JSON.stringify(row.data)),
+      ...parsedData,
+      ...promotedOverlay,
       createdAt: row.created_at,
       updatedAt: row.updated_at
     };
@@ -415,7 +552,8 @@ FIX INSTRUCTIONS:
     if (!this.inTransaction) await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
     const existingCols = await this.getTableColumns(tableName);
-    const id = params.data.id ?? Math.random().toString(36).substring(7);
+    const colConfig = this.collectionConfigs.get(params.collection);
+    const id = params.data.id ?? (0, import_core.generateDocumentId)(colConfig || params.collection);
     const now = (/* @__PURE__ */ new Date()).toISOString().replace("T", " ").replace("Z", "");
     const data = { ...params.data };
     delete data.id;
@@ -432,33 +570,115 @@ FIX INSTRUCTIONS:
     const placeholders = colNames.map(() => "?").join(", ");
     const values = [id, JSON.stringify(data), now, now, ...Object.values(promotedValues)];
     await this.query(`INSERT INTO \`${tableName}\` (${colNames.join(", ")}) VALUES (${placeholders})`, values);
-    return { id, ...data, createdAt: now, updatedAt: now };
+    return { id, ...data, ...promotedValues, createdAt: now, updatedAt: now };
   }
   async update(params) {
     if (!this.inTransaction) await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
     const existingCols = await this.getTableColumns(tableName);
-    const existing = await this.findOne({ collection: params.collection, id: params.id });
     const now = (/* @__PURE__ */ new Date()).toISOString().replace("T", " ").replace("Z", "");
-    const merged = { ...existing ?? {}, ...params.data };
-    delete merged.id;
-    delete merged.createdAt;
-    delete merged.updatedAt;
-    const promotedValues = {};
-    for (const col of existingCols) {
-      if (["id", "data", "created_at", "updated_at"].includes(col)) continue;
-      if (merged[col] !== void 0) {
-        promotedValues[col] = merged[col];
+    let whereSql = "";
+    let whereParams = [];
+    if (params.id) {
+      whereSql = "WHERE id = ?";
+      whereParams = [params.id];
+      if (params.where && Object.keys(params.where).length > 0) {
+        const parsed = (0, import_core.parseSqlWhere)(
+          params.where,
+          (field) => {
+            if (field === "id") return "`id`";
+            if (field === "createdAt" || field === "created_at") return "`created_at`";
+            if (field === "updatedAt" || field === "updated_at") return "`updated_at`";
+            if (existingCols.includes(field) && !["id", "data"].includes(field)) {
+              return `\`${field}\``;
+            }
+            return `JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field}'))`;
+          },
+          "?"
+        );
+        whereSql += ` AND (${parsed.sql})`;
+        whereParams.push(...parsed.params);
+      }
+    } else if (params.where && Object.keys(params.where).length > 0) {
+      const parsed = (0, import_core.parseSqlWhere)(
+        params.where,
+        (field) => {
+          if (field === "id") return "`id`";
+          if (field === "createdAt" || field === "created_at") return "`created_at`";
+          if (field === "updatedAt" || field === "updated_at") return "`updated_at`";
+          if (existingCols.includes(field) && !["id", "data"].includes(field)) {
+            return `\`${field}\``;
+          }
+          return `JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field}'))`;
+        },
+        "?"
+      );
+      whereSql = `WHERE ${parsed.sql}`;
+      whereParams = parsed.params;
+    } else {
+      throw new Error("update requires either id or where clause");
+    }
+    const setClauses = [];
+    const setParams = [];
+    const jsonPaths = [];
+    const jsonParams = [];
+    for (const [key, val] of Object.entries(params.data)) {
+      if (["id", "createdAt", "updatedAt"].includes(key)) continue;
+      const isPromoted = existingCols.includes(key) && !["id", "data", "created_at", "updated_at"].includes(key);
+      if (isNumericOp(val)) {
+        const delta = Number((val.increment ?? 0) - (val.decrement ?? 0));
+        if (isPromoted) {
+          const escapedCol = escapeMysqlIdentifier(key);
+          setClauses.push(`${escapedCol} = COALESCE(${escapedCol}, 0) + ?`);
+          setParams.push(delta);
+          jsonPaths.push(`'$.${key}', ${escapedCol}`);
+        } else {
+          jsonPaths.push(`'$.${key}', CAST(COALESCE(JSON_UNQUOTE(JSON_EXTRACT(data, '$.${key}')), 0) AS DECIMAL(19,4)) + ?`);
+          jsonParams.push(delta);
+        }
+      } else {
+        if (isPromoted) {
+          const escapedCol = escapeMysqlIdentifier(key);
+          setClauses.push(`${escapedCol} = ?`);
+          setParams.push(val);
+          jsonPaths.push(`'$.${key}', ${escapedCol}`);
+        } else if (val === null) {
+          jsonPaths.push(`'$.${key}', CAST('null' AS JSON)`);
+        } else if (typeof val === "object") {
+          jsonPaths.push(`'$.${key}', CAST(? AS JSON)`);
+          jsonParams.push(JSON.stringify(val));
+        } else {
+          jsonPaths.push(`'$.${key}', ?`);
+          jsonParams.push(val);
+        }
+      }
+    }
+    setClauses.push("updated_at = ?");
+    setParams.push(now);
+    if (jsonPaths.length > 0) {
+      setClauses.push(`data = JSON_SET(COALESCE(data, '{}'), ${jsonPaths.join(", ")})`);
+      setParams.push(...jsonParams);
+    }
+    const updateSql = `UPDATE \`${tableName}\` SET ${setClauses.join(", ")} ${whereSql}`;
+    const [res] = await this.query(updateSql, [...setParams, ...whereParams]);
+    let targetId = params.id;
+    if (!targetId && params.where) {
+      const found = await this.find({ collection: params.collection, where: params.where, limit: 1 });
+      targetId = found.docs[0]?.id;
+    }
+    if (targetId) {
+      const doc = await this.findOne({ collection: params.collection, id: targetId });
+      if (doc) {
+        doc.affectedRows = res?.affectedRows ?? 0;
+        return doc;
       }
     }
-    const setClauses = ["data = ?", "updated_at = ?", ...Object.keys(promotedValues).map((k) => `\`${k}\` = ?`)];
-    const values = [JSON.stringify(merged), now, ...Object.values(promotedValues), params.id];
-    await this.query(`UPDATE \`${tableName}\` SET ${setClauses.join(", ")} WHERE id = ?`, values);
-    return { id: params.id, ...merged, createdAt: existing?.createdAt, updatedAt: now };
+    return { id: targetId, ...params.data, affectedRows: res?.affectedRows ?? 0, updatedAt: now };
   }
   async sync(collections) {
     for (const col of collections) {
-      await this.ensureTable(col.slug, col.fields);
+      this.collectionConfigs.set(col.slug, col);
+      await this.ensureTable(col.slug, col.fields, col.indexes);
     }
   }
   async delete(params) {
@@ -525,7 +745,7 @@ FIX INSTRUCTIONS:
       const base = toFieldExpr(rawField);
       if (cast === "string") return base;
       if (cast === "boolean") return `IF(${base} IS NOT NULL, IF(${base} IN ('true','1'), 1, 0), NULL)`;
-      if (cast === "date") return `CAST(${base} AS DATETIME)`;
+      if (cast === "date") return `IF(${base} REGEXP '^[0-9]{4}-[0-9]{2}-[0-9]{2}', CAST(${base} AS DATETIME), NULL)`;
       const sqlType = cast === "integer" ? "SIGNED" : "DECIMAL(20,6)";
       return `IF(${base} REGEXP '^-?[0-9]+(\\\\.[0-9]+)?([eE][+-]?[0-9]+)?$', CAST(${base} AS ${sqlType}), NULL)`;
     };
@@ -595,11 +815,16 @@ FIX INSTRUCTIONS:
     const result = {};
     for (const name of Object.keys(args.aggregates)) {
       const raw = row[name];
+      const op = args.aggregates[name];
       if (isDistinctMap[name]) {
         const parsed = Array.isArray(raw) ? raw : typeof raw === "string" ? JSON.parse(raw) : raw ?? [];
         result[name] = Array.isArray(parsed) ? parsed.filter((v) => v !== null && v !== void 0) : [];
+      } else if (raw instanceof Date) {
+        result[name] = raw.toISOString();
+      } else if (op?.cast === "date") {
+        result[name] = raw === null || raw === void 0 ? null : String(raw);
       } else {
-        result[name] = raw === null || raw === void 0 ? null : Number(raw);
+        result[name] = raw === null || raw === void 0 ? null : isNaN(Number(raw)) ? raw : Number(raw);
       }
     }
     return result;
@@ -609,6 +834,7 @@ FIX INSTRUCTIONS:
     const cacheKey = getMysqlCacheKey(this.config);
     cache.delete(cacheKey);
     this.ensuredTables.clear();
+    this.failedIndexes.clear();
     this.tableColumnsCache.clear();
     if (this.initPromise) {
       try {

package/dist/index.d.cts

@@ -19,12 +19,15 @@ declare class MysqlAdapter implements DatabaseAdapter {
     private inTransaction;
     private tableLocks;
     private ensuredTables;
+    private failedIndexes;
     private tableColumnsCache;
+    private collectionConfigs;
     constructor(config: MysqlAdapterConfig);
     private handleConnectionError;
     private retryOperation;
     private ensureInitialized;
     private initialize;
+    private handleDatabaseError;
     private query;
     execute(sql: string, params?: any[]): Promise<any>;
     private getTableName;
@@ -36,10 +39,13 @@ declare class MysqlAdapter implements DatabaseAdapter {
         limit?: number;
         page?: number;
         sort?: string;
+        fields?: any[];
+        lock?: "for-update";
     }): Promise<PaginatedResult>;
     findOne(params: {
         collection: string;
         id: string;
+        lock?: "for-update";
     }): Promise<any>;
     create(params: {
         collection: string;
@@ -47,7 +53,8 @@ declare class MysqlAdapter implements DatabaseAdapter {
     }): Promise<any>;
     update(params: {
         collection: string;
-        id: string;
+        id?: string;
+        where?: any;
         data: any;
     }): Promise<any>;
     sync(collections: any[]): Promise<void>;

package/dist/index.d.ts

@@ -19,12 +19,15 @@ declare class MysqlAdapter implements DatabaseAdapter {
     private inTransaction;
     private tableLocks;
     private ensuredTables;
+    private failedIndexes;
     private tableColumnsCache;
+    private collectionConfigs;
     constructor(config: MysqlAdapterConfig);
     private handleConnectionError;
     private retryOperation;
     private ensureInitialized;
     private initialize;
+    private handleDatabaseError;
     private query;
     execute(sql: string, params?: any[]): Promise<any>;
     private getTableName;
@@ -36,10 +39,13 @@ declare class MysqlAdapter implements DatabaseAdapter {
         limit?: number;
         page?: number;
         sort?: string;
+        fields?: any[];
+        lock?: "for-update";
     }): Promise<PaginatedResult>;
     findOne(params: {
         collection: string;
         id: string;
+        lock?: "for-update";
     }): Promise<any>;
     create(params: {
         collection: string;
@@ -47,7 +53,8 @@ declare class MysqlAdapter implements DatabaseAdapter {
     }): Promise<any>;
     update(params: {
         collection: string;
-        id: string;
+        id?: string;
+        where?: any;
         data: any;
     }): Promise<any>;
     sync(collections: any[]): Promise<void>;

package/dist/index.js

@@ -1,6 +1,22 @@
 // src/index.ts
-import { parseSort, parseSqlWhere } from "@dyrected/core";
+import { parseSort, parseSqlWhere, DuplicateKeyError, generateDocumentId } from "@dyrected/core";
 import mysql from "mysql2/promise";
+function parseMysqlDuplicateKey(message) {
+  const match = message.match(/Duplicate entry '(.*)' for key '(?:[^.]*\.)?(.*)'/);
+  if (!match) return {};
+  const [, value, keyName] = match;
+  let field = keyName;
+  if (keyName === "PRIMARY") {
+    field = "id";
+  } else if (keyName.startsWith("uniq_") || keyName.startsWith("idx_")) {
+    const parts = keyName.split("_");
+    field = parts[parts.length - 1];
+  }
+  return { field, value };
+}
+function isNumericOp(val) {
+  return val !== null && typeof val === "object" && !Array.isArray(val) && ("increment" in val || "decrement" in val);
+}
 var MYSQL_CLIENT_CACHE_KEY = "__dyrectedMysqlClientCache";
 function getSharedMysqlClientCache() {
   const globalScope = globalThis;
@@ -33,7 +49,9 @@ var MysqlAdapter = class {
   inTransaction = false;
   tableLocks = /* @__PURE__ */ new Map();
   ensuredTables = /* @__PURE__ */ new Set();
+  failedIndexes = /* @__PURE__ */ new Set();
   tableColumnsCache = /* @__PURE__ */ new Map();
+  collectionConfigs = /* @__PURE__ */ new Map();
   constructor(config) {
     this.config = config;
   }
@@ -168,7 +186,7 @@ FIX INSTRUCTIONS:
           `);
           await pool.query(`
             CREATE TABLE IF NOT EXISTS _dyrected_ai_threads (
-              id VARCHAR(36) PRIMARY KEY,
+              id VARCHAR(191) PRIMARY KEY,
               project_id VARCHAR(255) NOT NULL,
               user_id VARCHAR(255) NOT NULL,
               title TEXT,
@@ -179,8 +197,8 @@ FIX INSTRUCTIONS:
           `);
           await pool.query(`
             CREATE TABLE IF NOT EXISTS _dyrected_ai_messages (
-              id VARCHAR(36) PRIMARY KEY,
-              thread_id VARCHAR(36) NOT NULL,
+              id VARCHAR(191) PRIMARY KEY,
+              thread_id VARCHAR(191) NOT NULL,
               role VARCHAR(50) NOT NULL,
               content LONGTEXT NOT NULL,
               created_at DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3),
@@ -204,12 +222,22 @@ FIX INSTRUCTIONS:
       throw error;
     }
   }
+  handleDatabaseError(err) {
+    if (err && (err.errno === 1062 || err.code === "ER_DUP_ENTRY" || err.message?.includes("Duplicate entry"))) {
+      const { field, value } = parseMysqlDuplicateKey(err.message || "");
+      throw new DuplicateKeyError(
+        `Duplicate entry${value ? ` '${value}'` : ""} for unique key${field ? ` '${field}'` : ""}`,
+        { field, value }
+      );
+    }
+    this.handleConnectionError(err);
+  }
   async query(sql, params) {
     await this.ensureInitialized();
     try {
       return await this.pool.query(sql, params);
     } catch (err) {
-      this.handleConnectionError(err);
+      this.handleDatabaseError(err);
     }
   }
   async execute(sql, params) {
@@ -217,7 +245,7 @@ FIX INSTRUCTIONS:
     try {
       return await this.pool.execute(sql, params);
     } catch (err) {
-      this.handleConnectionError(err);
+      this.handleDatabaseError(err);
     }
   }
   getTableName(slug) {
@@ -235,7 +263,7 @@ FIX INSTRUCTIONS:
     this.tableColumnsCache.set(tableName, existingCols);
     return existingCols;
   }
-  async ensureTable(slug, fields = []) {
+  async ensureTable(slug, fields = [], indexes = []) {
     if (slug === "_dyrected_ai_threads" || slug === "_dyrected_ai_messages") {
       return;
     }
@@ -259,20 +287,39 @@ FIX INSTRUCTIONS:
       const tableName = this.getTableName(slug);
       await this.query(`
         CREATE TABLE IF NOT EXISTS \`${tableName}\` (
-          id VARCHAR(36) PRIMARY KEY,
+          id VARCHAR(191) PRIMARY KEY,
           data JSON NOT NULL,
           created_at DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3),
           updated_at DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)
         )
       `);
       const existingCols = await this.getTableColumns(tableName);
+      try {
+        const [idCols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\` WHERE Field = 'id'`);
+        const idCol = idCols?.[0];
+        if (idCol && typeof idCol.Type === "string" && idCol.Type.toLowerCase().includes("varchar(36)")) {
+          await this.query(`ALTER TABLE \`${tableName}\` MODIFY COLUMN id VARCHAR(191) NOT NULL`);
+        }
+      } catch {
+      }
+      const indexedFields = /* @__PURE__ */ new Set();
+      if (Array.isArray(indexes)) {
+        for (const idx of indexes) {
+          if (Array.isArray(idx.fields)) {
+            for (const f of idx.fields) indexedFields.add(f);
+          }
+        }
+      }
       for (const field of fields) {
-        if (field.promoted && !existingCols.includes(field.name)) {
+        const shouldPromote = field.promoted || field.unique || indexedFields.has(field.name);
+        if (shouldPromote && !existingCols.includes(field.name)) {
           console.log(`[dyrected/mysql] Promoting field "${field.name}" to column in ${tableName}`);
-          let sqlType = "TEXT";
+          const isUniqueOrIndexed = field.unique || indexedFields.has(field.name);
+          let sqlType = isUniqueOrIndexed ? "VARCHAR(191)" : "TEXT";
           if (field.type === "number") sqlType = "DECIMAL(19,4)";
           if (field.type === "boolean") sqlType = "TINYINT(1)";
           if (field.type === "date" || field.type === "datetime") sqlType = "DATETIME(3)";
+          if (field.type === "textarea" || field.type === "richText" || field.type === "json") sqlType = "LONGTEXT";
           try {
             await this.query(`ALTER TABLE \`${tableName}\` ADD COLUMN \`${field.name}\` ${sqlType}`);
             existingCols.push(field.name);
@@ -300,6 +347,75 @@ FIX INSTRUCTIONS:
           }
         }
       }
+      const rawIndices = await this.query(`SHOW INDEX FROM \`${tableName}\``);
+      const existingIndicesRows = Array.isArray(rawIndices?.[0]) ? rawIndices[0] : Array.isArray(rawIndices) ? rawIndices : [];
+      const existingIndexNames = new Set(existingIndicesRows.map((r) => r?.Key_name).filter(Boolean));
+      for (const field of fields) {
+        if (field.unique) {
+          const idxName = `uniq_${tableName}_${field.name}`;
+          if (!existingIndexNames.has(idxName) && !existingIndexNames.has(field.name) && !this.failedIndexes.has(idxName)) {
+            try {
+              const [colInfoRows] = await this.query(`SHOW COLUMNS FROM \`${tableName}\` WHERE Field = ?`, [field.name]);
+              const colType = colInfoRows?.[0]?.Type?.toLowerCase() || "";
+              if (colType.includes("text")) {
+                await this.query(`ALTER TABLE \`${tableName}\` MODIFY COLUMN \`${field.name}\` VARCHAR(191)`);
+              }
+            } catch {
+            }
+            try {
+              await this.query(`ALTER TABLE \`${tableName}\` ADD UNIQUE INDEX \`${idxName}\` (\`${field.name}\`)`);
+              existingIndexNames.add(idxName);
+            } catch (err) {
+              if (err.errno !== 1061 && err.code !== "ER_DUP_KEYNAME") {
+                this.failedIndexes.add(idxName);
+                if (err.errno === 1062 || err.code === "ER_DUP_ENTRY") {
+                  console.warn(
+                    `[dyrected/mysql] Could not create unique index ${idxName} on ${tableName} because duplicate values already exist: ${err.message}. To enforce uniqueness, remove duplicate records.`
+                  );
+                } else {
+                  console.warn(`[dyrected/mysql] Could not create unique index ${idxName} on ${tableName}:`, err.message);
+                }
+              }
+            }
+          }
+        }
+      }
+      if (Array.isArray(indexes)) {
+        for (const idx of indexes) {
+          if (!Array.isArray(idx.fields) || idx.fields.length === 0) continue;
+          const isUnique = Boolean(idx.unique);
+          const idxName = idx.name || `${isUnique ? "uniq" : "idx"}_${tableName}_${idx.fields.join("_")}`;
+          if (!existingIndexNames.has(idxName) && !this.failedIndexes.has(idxName)) {
+            for (const fName of idx.fields) {
+              try {
+                const [colInfoRows] = await this.query(`SHOW COLUMNS FROM \`${tableName}\` WHERE Field = ?`, [fName]);
+                const colType = colInfoRows?.[0]?.Type?.toLowerCase() || "";
+                if (colType.includes("text")) {
+                  await this.query(`ALTER TABLE \`${tableName}\` MODIFY COLUMN \`${fName}\` VARCHAR(191)`);
+                }
+              } catch {
+              }
+            }
+            const uniqueKeyword = isUnique ? "UNIQUE " : "";
+            const colList = idx.fields.map((f) => `\`${f.replace(/`/g, "``")}\``).join(", ");
+            try {
+              await this.query(`ALTER TABLE \`${tableName}\` ADD ${uniqueKeyword}INDEX \`${idxName}\` (${colList})`);
+              existingIndexNames.add(idxName);
+            } catch (err) {
+              if (err.errno !== 1061 && err.code !== "ER_DUP_KEYNAME") {
+                this.failedIndexes.add(idxName);
+                if (err.errno === 1062 || err.code === "ER_DUP_ENTRY") {
+                  console.warn(
+                    `[dyrected/mysql] Could not create ${isUnique ? "unique " : ""}index ${idxName} on ${tableName} because duplicate values already exist: ${err.message}. To enforce uniqueness, remove duplicate records.`
+                  );
+                } else {
+                  console.warn(`[dyrected/mysql] Could not create index ${idxName} on ${tableName}:`, err.message);
+                }
+              }
+            }
+          }
+        }
+      }
       this.ensuredTables.add(slug);
       resolveLock();
     } catch (err) {
@@ -322,8 +438,9 @@ FIX INSTRUCTIONS:
       const result = parseSqlWhere(
         args.where,
         (field) => {
-          if (field === "createdAt") return "`created_at`";
-          if (field === "updatedAt") return "`updated_at`";
+          if (field === "id") return "`id`";
+          if (field === "createdAt" || field === "created_at") return "`created_at`";
+          if (field === "updatedAt" || field === "updated_at") return "`updated_at`";
           if (existingCols.includes(field) && !["id", "data"].includes(field)) {
             return `\`${field}\``;
           }
@@ -335,21 +452,32 @@ FIX INSTRUCTIONS:
       whereParams = result.params;
     }
     const sort = normalizeMysqlSort(args.sort, existingCols);
+    const lock = this.inTransaction || args.lock === "for-update" ? " FOR UPDATE" : "";
     const [countRows] = await this.query(
       `SELECT COUNT(*) AS total FROM \`${tableName}\` ${whereSql}`,
       whereParams
     );
     const total = Number(countRows[0].total);
     const [rows] = await this.query(
-      `SELECT * FROM \`${tableName}\` ${whereSql} ORDER BY ${sort} LIMIT ? OFFSET ?`,
+      `SELECT * FROM \`${tableName}\` ${whereSql} ORDER BY ${sort} LIMIT ? OFFSET ?${lock}`,
       [...whereParams, limit, offset]
     );
-    const docs = rows.map((r) => ({
-      id: r.id,
-      ...JSON.parse(typeof r.data === "string" ? r.data : JSON.stringify(r.data)),
-      createdAt: r.created_at,
-      updatedAt: r.updated_at
-    }));
+    const docs = rows.map((r) => {
+      const parsedData = JSON.parse(typeof r.data === "string" ? r.data : JSON.stringify(r.data));
+      const promotedOverlay = {};
+      for (const col of existingCols) {
+        if (!["id", "data", "created_at", "updated_at"].includes(col) && r[col] !== void 0 && r[col] !== null) {
+          promotedOverlay[col] = r[col];
+        }
+      }
+      return {
+        id: r.id,
+        ...parsedData,
+        ...promotedOverlay,
+        createdAt: r.created_at,
+        updatedAt: r.updated_at
+      };
+    });
     const totalPages = Math.ceil(total / limit);
     return {
       docs,
@@ -364,13 +492,22 @@ FIX INSTRUCTIONS:
   async findOne(params) {
     if (!this.inTransaction) await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
-    const lock = this.inTransaction ? " FOR UPDATE" : "";
+    const lock = this.inTransaction || params.lock === "for-update" ? " FOR UPDATE" : "";
     const [rows] = await this.query(`SELECT * FROM \`${tableName}\` WHERE id = ?${lock}`, [params.id]);
     const row = rows[0];
     if (!row) return null;
+    const parsedData = JSON.parse(typeof row.data === "string" ? row.data : JSON.stringify(row.data));
+    const existingCols = await this.getTableColumns(tableName);
+    const promotedOverlay = {};
+    for (const col of existingCols) {
+      if (!["id", "data", "created_at", "updated_at"].includes(col) && row[col] !== void 0 && row[col] !== null) {
+        promotedOverlay[col] = row[col];
+      }
+    }
     return {
       id: row.id,
-      ...JSON.parse(typeof row.data === "string" ? row.data : JSON.stringify(row.data)),
+      ...parsedData,
+      ...promotedOverlay,
       createdAt: row.created_at,
       updatedAt: row.updated_at
     };
@@ -379,7 +516,8 @@ FIX INSTRUCTIONS:
     if (!this.inTransaction) await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
     const existingCols = await this.getTableColumns(tableName);
-    const id = params.data.id ?? Math.random().toString(36).substring(7);
+    const colConfig = this.collectionConfigs.get(params.collection);
+    const id = params.data.id ?? generateDocumentId(colConfig || params.collection);
     const now = (/* @__PURE__ */ new Date()).toISOString().replace("T", " ").replace("Z", "");
     const data = { ...params.data };
     delete data.id;
@@ -396,33 +534,115 @@ FIX INSTRUCTIONS:
     const placeholders = colNames.map(() => "?").join(", ");
     const values = [id, JSON.stringify(data), now, now, ...Object.values(promotedValues)];
     await this.query(`INSERT INTO \`${tableName}\` (${colNames.join(", ")}) VALUES (${placeholders})`, values);
-    return { id, ...data, createdAt: now, updatedAt: now };
+    return { id, ...data, ...promotedValues, createdAt: now, updatedAt: now };
   }
   async update(params) {
     if (!this.inTransaction) await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
     const existingCols = await this.getTableColumns(tableName);
-    const existing = await this.findOne({ collection: params.collection, id: params.id });
     const now = (/* @__PURE__ */ new Date()).toISOString().replace("T", " ").replace("Z", "");
-    const merged = { ...existing ?? {}, ...params.data };
-    delete merged.id;
-    delete merged.createdAt;
-    delete merged.updatedAt;
-    const promotedValues = {};
-    for (const col of existingCols) {
-      if (["id", "data", "created_at", "updated_at"].includes(col)) continue;
-      if (merged[col] !== void 0) {
-        promotedValues[col] = merged[col];
+    let whereSql = "";
+    let whereParams = [];
+    if (params.id) {
+      whereSql = "WHERE id = ?";
+      whereParams = [params.id];
+      if (params.where && Object.keys(params.where).length > 0) {
+        const parsed = parseSqlWhere(
+          params.where,
+          (field) => {
+            if (field === "id") return "`id`";
+            if (field === "createdAt" || field === "created_at") return "`created_at`";
+            if (field === "updatedAt" || field === "updated_at") return "`updated_at`";
+            if (existingCols.includes(field) && !["id", "data"].includes(field)) {
+              return `\`${field}\``;
+            }
+            return `JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field}'))`;
+          },
+          "?"
+        );
+        whereSql += ` AND (${parsed.sql})`;
+        whereParams.push(...parsed.params);
+      }
+    } else if (params.where && Object.keys(params.where).length > 0) {
+      const parsed = parseSqlWhere(
+        params.where,
+        (field) => {
+          if (field === "id") return "`id`";
+          if (field === "createdAt" || field === "created_at") return "`created_at`";
+          if (field === "updatedAt" || field === "updated_at") return "`updated_at`";
+          if (existingCols.includes(field) && !["id", "data"].includes(field)) {
+            return `\`${field}\``;
+          }
+          return `JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field}'))`;
+        },
+        "?"
+      );
+      whereSql = `WHERE ${parsed.sql}`;
+      whereParams = parsed.params;
+    } else {
+      throw new Error("update requires either id or where clause");
+    }
+    const setClauses = [];
+    const setParams = [];
+    const jsonPaths = [];
+    const jsonParams = [];
+    for (const [key, val] of Object.entries(params.data)) {
+      if (["id", "createdAt", "updatedAt"].includes(key)) continue;
+      const isPromoted = existingCols.includes(key) && !["id", "data", "created_at", "updated_at"].includes(key);
+      if (isNumericOp(val)) {
+        const delta = Number((val.increment ?? 0) - (val.decrement ?? 0));
+        if (isPromoted) {
+          const escapedCol = escapeMysqlIdentifier(key);
+          setClauses.push(`${escapedCol} = COALESCE(${escapedCol}, 0) + ?`);
+          setParams.push(delta);
+          jsonPaths.push(`'$.${key}', ${escapedCol}`);
+        } else {
+          jsonPaths.push(`'$.${key}', CAST(COALESCE(JSON_UNQUOTE(JSON_EXTRACT(data, '$.${key}')), 0) AS DECIMAL(19,4)) + ?`);
+          jsonParams.push(delta);
+        }
+      } else {
+        if (isPromoted) {
+          const escapedCol = escapeMysqlIdentifier(key);
+          setClauses.push(`${escapedCol} = ?`);
+          setParams.push(val);
+          jsonPaths.push(`'$.${key}', ${escapedCol}`);
+        } else if (val === null) {
+          jsonPaths.push(`'$.${key}', CAST('null' AS JSON)`);
+        } else if (typeof val === "object") {
+          jsonPaths.push(`'$.${key}', CAST(? AS JSON)`);
+          jsonParams.push(JSON.stringify(val));
+        } else {
+          jsonPaths.push(`'$.${key}', ?`);
+          jsonParams.push(val);
+        }
+      }
+    }
+    setClauses.push("updated_at = ?");
+    setParams.push(now);
+    if (jsonPaths.length > 0) {
+      setClauses.push(`data = JSON_SET(COALESCE(data, '{}'), ${jsonPaths.join(", ")})`);
+      setParams.push(...jsonParams);
+    }
+    const updateSql = `UPDATE \`${tableName}\` SET ${setClauses.join(", ")} ${whereSql}`;
+    const [res] = await this.query(updateSql, [...setParams, ...whereParams]);
+    let targetId = params.id;
+    if (!targetId && params.where) {
+      const found = await this.find({ collection: params.collection, where: params.where, limit: 1 });
+      targetId = found.docs[0]?.id;
+    }
+    if (targetId) {
+      const doc = await this.findOne({ collection: params.collection, id: targetId });
+      if (doc) {
+        doc.affectedRows = res?.affectedRows ?? 0;
+        return doc;
       }
     }
-    const setClauses = ["data = ?", "updated_at = ?", ...Object.keys(promotedValues).map((k) => `\`${k}\` = ?`)];
-    const values = [JSON.stringify(merged), now, ...Object.values(promotedValues), params.id];
-    await this.query(`UPDATE \`${tableName}\` SET ${setClauses.join(", ")} WHERE id = ?`, values);
-    return { id: params.id, ...merged, createdAt: existing?.createdAt, updatedAt: now };
+    return { id: targetId, ...params.data, affectedRows: res?.affectedRows ?? 0, updatedAt: now };
   }
   async sync(collections) {
     for (const col of collections) {
-      await this.ensureTable(col.slug, col.fields);
+      this.collectionConfigs.set(col.slug, col);
+      await this.ensureTable(col.slug, col.fields, col.indexes);
     }
   }
   async delete(params) {
@@ -489,7 +709,7 @@ FIX INSTRUCTIONS:
       const base = toFieldExpr(rawField);
       if (cast === "string") return base;
       if (cast === "boolean") return `IF(${base} IS NOT NULL, IF(${base} IN ('true','1'), 1, 0), NULL)`;
-      if (cast === "date") return `CAST(${base} AS DATETIME)`;
+      if (cast === "date") return `IF(${base} REGEXP '^[0-9]{4}-[0-9]{2}-[0-9]{2}', CAST(${base} AS DATETIME), NULL)`;
       const sqlType = cast === "integer" ? "SIGNED" : "DECIMAL(20,6)";
       return `IF(${base} REGEXP '^-?[0-9]+(\\\\.[0-9]+)?([eE][+-]?[0-9]+)?$', CAST(${base} AS ${sqlType}), NULL)`;
     };
@@ -559,11 +779,16 @@ FIX INSTRUCTIONS:
     const result = {};
     for (const name of Object.keys(args.aggregates)) {
       const raw = row[name];
+      const op = args.aggregates[name];
       if (isDistinctMap[name]) {
         const parsed = Array.isArray(raw) ? raw : typeof raw === "string" ? JSON.parse(raw) : raw ?? [];
         result[name] = Array.isArray(parsed) ? parsed.filter((v) => v !== null && v !== void 0) : [];
+      } else if (raw instanceof Date) {
+        result[name] = raw.toISOString();
+      } else if (op?.cast === "date") {
+        result[name] = raw === null || raw === void 0 ? null : String(raw);
       } else {
-        result[name] = raw === null || raw === void 0 ? null : Number(raw);
+        result[name] = raw === null || raw === void 0 ? null : isNaN(Number(raw)) ? raw : Number(raw);
       }
     }
     return result;
@@ -573,6 +798,7 @@ FIX INSTRUCTIONS:
     const cacheKey = getMysqlCacheKey(this.config);
     cache.delete(cacheKey);
     this.ensuredTables.clear();
+    this.failedIndexes.clear();
     this.tableColumnsCache.clear();
     if (this.initPromise) {
       try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dyrected/db-mysql",
-  "version": "2.15.0",
+  "version": "2.17.0",
   "description": "MySQL adapter for Dyrected CMS",
   "type": "module",
   "files": [
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "mysql2": "^3.22.3",
-    "@dyrected/core": "^2.15.0"
+    "@dyrected/core": "^2.17.0"
   },
   "devDependencies": {
     "tsup": "^8.0.0",