@dyrected/db-mysql 2.5.27 → 2.5.28

package/dist/index.cjs

@@ -36,6 +36,19 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 var import_core = require("@dyrected/core");
 var import_promise = __toESM(require("mysql2/promise"), 1);
+function escapeMysqlIdentifier(identifier) {
+  return `\`${identifier.replace(/`/g, "``")}\``;
+}
+function normalizeMysqlSort(sort, existingCols) {
+  return (0, import_core.parseSort)(sort).map(({ field, direction }) => {
+    if (field === "createdAt" || field === "created_at") return `\`created_at\` ${direction}`;
+    if (field === "updatedAt" || field === "updated_at") return `\`updated_at\` ${direction}`;
+    if (existingCols.includes(field) && !["id", "data"].includes(field)) {
+      return `${escapeMysqlIdentifier(field)} ${direction}`;
+    }
+    return `JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field}')) ${direction}`;
+  }).join(", ");
+}
 var MysqlAdapter = class {
   pool;
   config;
@@ -196,8 +209,7 @@ FIX INSTRUCTIONS:
       whereSql = `WHERE ${result.sql}`;
       whereParams = result.params;
     }
-    const rawSort = args.sort ?? "created_at DESC";
-    const sort = rawSort.replace(/\bcreatedAt\b/g, "created_at").replace(/\bupdatedAt\b/g, "updated_at");
+    const sort = normalizeMysqlSort(args.sort, existingCols);
     const [countRows] = await this.query(
       `SELECT COUNT(*) AS total FROM \`${tableName}\` ${whereSql}`,
       whereParams

package/dist/index.js

@@ -1,6 +1,19 @@
 // src/index.ts
-import { parseSqlWhere } from "@dyrected/core";
+import { parseSort, parseSqlWhere } from "@dyrected/core";
 import mysql from "mysql2/promise";
+function escapeMysqlIdentifier(identifier) {
+  return `\`${identifier.replace(/`/g, "``")}\``;
+}
+function normalizeMysqlSort(sort, existingCols) {
+  return parseSort(sort).map(({ field, direction }) => {
+    if (field === "createdAt" || field === "created_at") return `\`created_at\` ${direction}`;
+    if (field === "updatedAt" || field === "updated_at") return `\`updated_at\` ${direction}`;
+    if (existingCols.includes(field) && !["id", "data"].includes(field)) {
+      return `${escapeMysqlIdentifier(field)} ${direction}`;
+    }
+    return `JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field}')) ${direction}`;
+  }).join(", ");
+}
 var MysqlAdapter = class {
   pool;
   config;
@@ -161,8 +174,7 @@ FIX INSTRUCTIONS:
       whereSql = `WHERE ${result.sql}`;
       whereParams = result.params;
     }
-    const rawSort = args.sort ?? "created_at DESC";
-    const sort = rawSort.replace(/\bcreatedAt\b/g, "created_at").replace(/\bupdatedAt\b/g, "updated_at");
+    const sort = normalizeMysqlSort(args.sort, existingCols);
     const [countRows] = await this.query(
       `SELECT COUNT(*) AS total FROM \`${tableName}\` ${whereSql}`,
       whereParams

package/package.json

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