@dyrected/db-mysql 2.7.1 → 2.8.0

package/dist/index.cjs

@@ -348,6 +348,71 @@ FIX INSTRUCTIONS:
       await this.pool.end();
     }
   }
+  async aggregate(args) {
+    if (Object.keys(args.aggregates).length === 0) {
+      return {};
+    }
+    const tableName = this.getTableName(args.collection);
+    if (!this.inTransaction) await this.ensureTable(args.collection);
+    const [cols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\``);
+    const existingCols = cols.map((c) => c.Field);
+    const toFieldExpr = (field) => {
+      if (field === "createdAt") return "`created_at`";
+      if (field === "updatedAt") return "`updated_at`";
+      if (existingCols.includes(field) && !["id", "data"].includes(field)) {
+        return `\`${field}\``;
+      }
+      return `JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field}'))`;
+    };
+    const toCastExpr = (rawField, cast) => {
+      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)`;
+      const sqlType = cast === "integer" ? "SIGNED" : "DECIMAL(20,6)";
+      return `IF(${base} REGEXP '^-?[0-9]+(\\\\.[0-9]+)?([eE][+-]?[0-9]+)?$', CAST(${base} AS ${sqlType}), NULL)`;
+    };
+    const selectParts = [];
+    const allParams = [];
+    for (const [name, op] of Object.entries(args.aggregates)) {
+      let whereSql = null;
+      if (op.where && Object.keys(op.where).length > 0) {
+        const parsed = (0, import_core.parseSqlWhere)(op.where, toFieldExpr, "?");
+        whereSql = parsed.sql;
+        allParams.push(...parsed.params);
+      }
+      let aggExpr;
+      if ("count" in op) {
+        aggExpr = whereSql ? `COUNT(IF(${whereSql}, 1, NULL))` : `COUNT(*)`;
+      } else if (op.sum) {
+        const val = toCastExpr(op.sum, op.cast);
+        aggExpr = whereSql ? `SUM(IF(${whereSql}, ${val}, NULL))` : `SUM(${val})`;
+      } else if (op.avg) {
+        const val = toCastExpr(op.avg, op.cast);
+        aggExpr = whereSql ? `AVG(IF(${whereSql}, ${val}, NULL))` : `AVG(${val})`;
+      } else if (op.min) {
+        const val = toCastExpr(op.min, op.cast);
+        aggExpr = whereSql ? `MIN(IF(${whereSql}, ${val}, NULL))` : `MIN(${val})`;
+      } else if (op.max) {
+        const val = toCastExpr(op.max, op.cast);
+        aggExpr = whereSql ? `MAX(IF(${whereSql}, ${val}, NULL))` : `MAX(${val})`;
+      } else {
+        aggExpr = whereSql ? `COUNT(IF(${whereSql}, 1, NULL))` : `COUNT(*)`;
+      }
+      selectParts.push(
+        `${aggExpr} AS \`${name.replace(/`/g, "``")}\``
+      );
+    }
+    const query = `SELECT ${selectParts.join(", ")} FROM \`${tableName}\``;
+    const [rows] = await this.query(query, allParams);
+    const row = rows[0] ?? {};
+    const result = {};
+    for (const name of Object.keys(args.aggregates)) {
+      const raw = row[name];
+      result[name] = raw === null || raw === void 0 ? null : Number(raw);
+    }
+    return result;
+  }
 };
 var mysqlAdapter = (config) => new MysqlAdapter(config);
 // Annotate the CommonJS export names for ESM import in node:

package/dist/index.d.cts

@@ -58,6 +58,10 @@ declare class MysqlAdapter implements DatabaseAdapter {
     transaction<T>(callback: (db: DatabaseAdapter) => Promise<T>): Promise<T>;
     /** Gracefully close the connection pool. Call on process exit. */
     close(): Promise<void>;
+    aggregate(args: {
+        collection: string;
+        aggregates: Record<string, any>;
+    }): Promise<Record<string, number | null>>;
 }
 declare const mysqlAdapter: (config: MysqlAdapterConfig) => MysqlAdapter;
 

package/dist/index.d.ts

@@ -58,6 +58,10 @@ declare class MysqlAdapter implements DatabaseAdapter {
     transaction<T>(callback: (db: DatabaseAdapter) => Promise<T>): Promise<T>;
     /** Gracefully close the connection pool. Call on process exit. */
     close(): Promise<void>;
+    aggregate(args: {
+        collection: string;
+        aggregates: Record<string, any>;
+    }): Promise<Record<string, number | null>>;
 }
 declare const mysqlAdapter: (config: MysqlAdapterConfig) => MysqlAdapter;
 

package/dist/index.js

@@ -313,6 +313,71 @@ FIX INSTRUCTIONS:
       await this.pool.end();
     }
   }
+  async aggregate(args) {
+    if (Object.keys(args.aggregates).length === 0) {
+      return {};
+    }
+    const tableName = this.getTableName(args.collection);
+    if (!this.inTransaction) await this.ensureTable(args.collection);
+    const [cols] = await this.query(`SHOW COLUMNS FROM \`${tableName}\``);
+    const existingCols = cols.map((c) => c.Field);
+    const toFieldExpr = (field) => {
+      if (field === "createdAt") return "`created_at`";
+      if (field === "updatedAt") return "`updated_at`";
+      if (existingCols.includes(field) && !["id", "data"].includes(field)) {
+        return `\`${field}\``;
+      }
+      return `JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field}'))`;
+    };
+    const toCastExpr = (rawField, cast) => {
+      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)`;
+      const sqlType = cast === "integer" ? "SIGNED" : "DECIMAL(20,6)";
+      return `IF(${base} REGEXP '^-?[0-9]+(\\\\.[0-9]+)?([eE][+-]?[0-9]+)?$', CAST(${base} AS ${sqlType}), NULL)`;
+    };
+    const selectParts = [];
+    const allParams = [];
+    for (const [name, op] of Object.entries(args.aggregates)) {
+      let whereSql = null;
+      if (op.where && Object.keys(op.where).length > 0) {
+        const parsed = parseSqlWhere(op.where, toFieldExpr, "?");
+        whereSql = parsed.sql;
+        allParams.push(...parsed.params);
+      }
+      let aggExpr;
+      if ("count" in op) {
+        aggExpr = whereSql ? `COUNT(IF(${whereSql}, 1, NULL))` : `COUNT(*)`;
+      } else if (op.sum) {
+        const val = toCastExpr(op.sum, op.cast);
+        aggExpr = whereSql ? `SUM(IF(${whereSql}, ${val}, NULL))` : `SUM(${val})`;
+      } else if (op.avg) {
+        const val = toCastExpr(op.avg, op.cast);
+        aggExpr = whereSql ? `AVG(IF(${whereSql}, ${val}, NULL))` : `AVG(${val})`;
+      } else if (op.min) {
+        const val = toCastExpr(op.min, op.cast);
+        aggExpr = whereSql ? `MIN(IF(${whereSql}, ${val}, NULL))` : `MIN(${val})`;
+      } else if (op.max) {
+        const val = toCastExpr(op.max, op.cast);
+        aggExpr = whereSql ? `MAX(IF(${whereSql}, ${val}, NULL))` : `MAX(${val})`;
+      } else {
+        aggExpr = whereSql ? `COUNT(IF(${whereSql}, 1, NULL))` : `COUNT(*)`;
+      }
+      selectParts.push(
+        `${aggExpr} AS \`${name.replace(/`/g, "``")}\``
+      );
+    }
+    const query = `SELECT ${selectParts.join(", ")} FROM \`${tableName}\``;
+    const [rows] = await this.query(query, allParams);
+    const row = rows[0] ?? {};
+    const result = {};
+    for (const name of Object.keys(args.aggregates)) {
+      const raw = row[name];
+      result[name] = raw === null || raw === void 0 ? null : Number(raw);
+    }
+    return result;
+  }
 };
 var mysqlAdapter = (config) => new MysqlAdapter(config);
 export {

package/package.json

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