@dbcube/query-builder 5.1.6 → 5.2.2

package/dist/index.js

@@ -1,6 +1,7 @@
 // src/lib/Database.ts
 import fs from "fs";
 import path2 from "path";
+import { randomUUID } from "crypto";
 import { QueryEngine, ComputedFieldProcessor, TriggerProcessor } from "@dbcube/core";
 
 // src/lib/Trigger.ts
@@ -37,11 +38,17 @@ var Trigger = class {
       const pathFile = path.resolve(process.cwd(), "dbcube", "triggers", `${trigger.database_ref}_${trigger.table_ref}_${trigger.type}.js`);
       const requireUrl = typeof __filename !== "undefined" ? __filename : process.cwd();
       const require2 = createRequire(requireUrl);
-      delete require2.cache[require2.resolve(pathFile)];
-      const triggerModule = require2(pathFile);
-      const dataProcess = triggerModule.default || triggerModule;
-      await dataProcess({ db: this.instance, oldData: row, newData: row });
-      interceptor.restore();
+      try {
+        delete require2.cache[require2.resolve(pathFile)];
+      } catch {
+      }
+      try {
+        const triggerModule = require2(pathFile);
+        const dataProcess = triggerModule.default || triggerModule;
+        await dataProcess({ db: this.instance, oldData: row, newData: row });
+      } finally {
+        interceptor.restore();
+      }
       return interceptor;
     }
     return null;
@@ -105,7 +112,10 @@ var Database = class _Database {
     } catch (error) {
       try {
         await this.engine.rollbackTransaction(txId);
-      } catch {
+      } catch (rollbackError) {
+        console.error(
+          `[dbcube] Rollback of transaction ${txId} failed: ${rollbackError?.message ?? rollbackError}`
+        );
       }
       throw error;
     }
@@ -130,10 +140,9 @@ var Database = class _Database {
     if (response.status != 200) {
       returnFormattedError(response.status, response.message);
     }
-    return response.data;
   }
   async disconnect() {
-    return this.engine.run("query_engine", [
+    await this.engine.run("query_engine", [
       "--action",
       "disconnect"
     ]);
@@ -194,8 +203,12 @@ var Table = class _Table {
   triggers;
   txId = null;
   relations = [];
-  constructor(instance, databaseName, tableName, engine = null, computedFields = [], triggers = [], txId = null) {
+  /** Builders de grupo mutan en sitio (ver clone()) */
+  _mutable = false;
+  instance;
+  constructor(instance, databaseName, tableName, engine, computedFields = [], triggers = [], txId = null) {
     this.engine = engine;
+    this.instance = instance;
     this.computedFields = computedFields;
     this.triggers = triggers;
     this.trigger = new Trigger(instance, databaseName, triggers);
@@ -272,7 +285,8 @@ var Table = class _Table {
    */
   whereGroup(callback) {
     const clone = this.clone();
-    const groupQuery = new _Table(this, clone.dml.database, clone.dml.table, clone.engine);
+    const groupQuery = new _Table(this.instance, clone.dml.database, clone.dml.table, clone.engine);
+    groupQuery._mutable = true;
     callback(groupQuery);
     clone.dml.where.push({
       type: clone.nextType,
@@ -534,6 +548,7 @@ var Table = class _Table {
       column,
       alias: "count"
     };
+    clone.dml.orderBy = [];
     clone.dml.columns = [`COUNT(${column}) AS count`];
     clone.dml.data = null;
     clone.dml.limit = null;
@@ -567,6 +582,7 @@ var Table = class _Table {
       column,
       alias: "sum"
     };
+    clone.dml.orderBy = [];
     clone.dml.columns = [`SUM(${column}) AS sum`];
     clone.dml.data = null;
     clone.dml.limit = 1;
@@ -599,6 +615,7 @@ var Table = class _Table {
       column,
       alias: "avg"
     };
+    clone.dml.orderBy = [];
     clone.dml.columns = [`AVG(${column}) AS avg`];
     clone.dml.data = null;
     clone.dml.limit = 1;
@@ -631,6 +648,7 @@ var Table = class _Table {
       column,
       alias: "max"
     };
+    clone.dml.orderBy = [];
     clone.dml.columns = [`MAX(${column}) AS max`];
     clone.dml.data = null;
     clone.dml.limit = 1;
@@ -663,6 +681,7 @@ var Table = class _Table {
       column,
       alias: "min"
     };
+    clone.dml.orderBy = [];
     clone.dml.columns = [`MIN(${column}) AS min`];
     clone.dml.data = null;
     clone.dml.limit = 1;
@@ -819,11 +838,10 @@ var Table = class _Table {
    * console.log(user); // { id: 1, name: 'John' }
    */
   async find(value, column = "id") {
-    const clone = this.clone();
+    const clone = this.clone().where(column, "=", value);
     clone.dml.type = "select";
     clone.dml.data = null;
     clone.dml.aggregation = null;
-    clone.where(column, "=", value);
     clone.dml.limit = 1;
     try {
       const result = await clone.getResponse();
@@ -880,8 +898,7 @@ var Table = class _Table {
     }
     clone.dml.type = "update";
     clone.dml.data = data;
-    await clone.getResponse(clone.dml, "Update");
-    return data;
+    return clone.getResponse(clone.dml, "Update");
   }
   /**
    * Deletes rows from the table based on the defined conditions.
@@ -1101,12 +1118,37 @@ var Table = class _Table {
       throw new Error("The upsert method requires at least one conflict key column.");
     }
     const motor = this.engine?.getConfig?.()?.type ?? "mysql";
-    if (motor === "mongodb") {
-      throw new Error("upsert() is not supported for MongoDB yet. Use update() + insert() or raw commands.");
-    }
     const table = this.dml.table;
     const columns = Object.keys(data[0]);
     const targets = updateColumns ?? columns.filter((c) => !conflictKeys.includes(c));
+    assertValidIdentifier(table, "table");
+    for (const c of columns) assertValidIdentifier(c, "column");
+    for (const c of conflictKeys) assertValidIdentifier(c, "conflict key");
+    for (const c of targets) assertValidIdentifier(c, "update column");
+    if (motor === "mongodb") {
+      const updates = data.map((row) => {
+        const q = {};
+        for (const k of conflictKeys) q[k] = row[k];
+        const set = {};
+        for (const c of targets) if (c in row) set[c] = row[c];
+        const setOnInsert = {};
+        for (const c of columns) {
+          if (!targets.includes(c) && !conflictKeys.includes(c)) setOnInsert[c] = row[c];
+        }
+        if (!("uuid" in row)) setOnInsert["uuid"] = randomUUID();
+        const u = {};
+        if (Object.keys(set).length) u["$set"] = set;
+        if (Object.keys(setOnInsert).length) u["$setOnInsert"] = setOnInsert;
+        return { q, u, upsert: true, multi: false };
+      });
+      const command = JSON.stringify({ update: table, updates });
+      const response2 = await this.engine.rawQuery(command, [], this.txId ?? void 0);
+      if (response2.status != 200) {
+        returnFormattedError(response2.status, response2.message);
+        throw new Error(response2.message);
+      }
+      return response2.data;
+    }
     const quote = (id) => motor === "mysql" ? `\`${id}\`` : `"${id}"`;
     const params = [];
     const placeholder = () => motor === "postgres" || motor === "postgresql" ? `$${params.length}` : "?";
@@ -1127,6 +1169,9 @@ var Table = class _Table {
       const updates = targets.map((c) => `${quote(c)} = excluded.${quote(c)}`).join(", ");
       sql = `INSERT INTO ${quote(table)} (${colsSql}) VALUES ${rowsSql} ON CONFLICT (${conflict}) DO UPDATE SET ${updates}`;
     }
+    if (motor === "sqlite") {
+      await this.engine.rawQuery("SELECT name FROM sqlite_master LIMIT 1", [], this.txId ?? void 0);
+    }
     const response = await this.engine.rawQuery(sql, params, this.txId ?? void 0);
     if (response.status != 200) {
       returnFormattedError(response.status, response.message);
@@ -1181,7 +1226,7 @@ var Table = class _Table {
           foreignKey = foreignKey ?? `${singularize(this.dml.table)}_id`;
         }
       }
-      const relatedQuery = new _Table(this, this.dml.database, relatedTable, this.engine, this.computedFields, this.triggers, this.txId);
+      const relatedQuery = new _Table(this.instance, this.dml.database, relatedTable, this.engine, this.computedFields, this.triggers, this.txId);
       if (type === "one") {
         const fkValues = [...new Set(rows.map((r) => r[foreignKey]).filter((v) => v !== null && v !== void 0))];
         const related = fkValues.length > 0 ? await relatedQuery.whereIn(localKey, fkValues).get() : [];
@@ -1209,6 +1254,7 @@ var Table = class _Table {
     const localDML = dml ? dml : this.dml;
     const computedFieldsNeeded = [];
     let dependeciesArrray = [];
+    const requestedColumns = new Set(localDML.columns ?? []);
     if (this.computedFields.length > 0) {
       let columns = localDML.columns;
       for (const field of localDML.columns) {
@@ -1236,25 +1282,28 @@ var Table = class _Table {
             const interceptor = await this.trigger.execute("before" + type, data);
             const response = await this.engine.executeDml(newDML, this.txId ?? void 0);
             if (response.status != 200) {
-              interceptor.discard();
+              interceptor?.discard();
               returnFormattedError(response.status, response.message);
+              throw new Error(String(response.message));
             }
-            await interceptor.commit();
+            await interceptor?.commit();
             arrayResult = response.data;
           }
           if (after) {
             const response = await this.engine.executeDml(newDML, this.txId ?? void 0);
             if (response.status != 200) {
               returnFormattedError(response.status, response.message);
+              throw new Error(String(response.message));
             }
             const interceptor = await this.trigger.execute("after" + type, data);
-            await interceptor.commit();
+            await interceptor?.commit();
           }
         }
       } else {
         const response = await this.engine.executeDml(localDML, this.txId ?? void 0);
         if (response.status != 200) {
           returnFormattedError(response.status, response.message);
+          throw new Error(String(response.message));
         }
         arrayResult = response.data;
       }
@@ -1262,14 +1311,16 @@ var Table = class _Table {
       const response = await this.engine.executeDml(localDML, this.txId ?? void 0);
       if (response.status != 200) {
         returnFormattedError(response.status, response.message);
+        throw new Error(String(response.message));
       }
       arrayResult = response.data;
     }
     if (computedFieldsNeeded.length > 0) {
       let newDataset = ComputedFieldProcessor.computedFields(arrayResult, computedFieldsNeeded);
+      const toRemove = dependeciesArrray.filter((key) => !requestedColumns.has(key));
       const result = newDataset.map((obj) => {
         const newObj = { ...obj };
-        dependeciesArrray.forEach((key) => delete newObj[key]);
+        toRemove.forEach((key) => delete newObj[key]);
         return newObj;
       });
       return result;
@@ -1277,8 +1328,10 @@ var Table = class _Table {
     return arrayResult;
   }
   clone() {
+    if (this._mutable) return this;
     const cloned = Object.create(Object.getPrototypeOf(this));
     cloned.engine = this.engine;
+    cloned.instance = this.instance;
     cloned.nextType = this.nextType;
     cloned.computedFields = this.computedFields;
     cloned.trigger = this.trigger;
@@ -1346,6 +1399,11 @@ function loadCubeRelations() {
   cubeRelationsCache = result;
   return result;
 }
+function assertValidIdentifier(name, kind) {
+  if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(name)) {
+    throw new Error(`Invalid ${kind} name: '${name}'. Only letters, numbers and underscore are allowed.`);
+  }
+}
 function singularize(word) {
   if (word.endsWith("ies")) return word.slice(0, -3) + "y";
   if (word.endsWith("ses")) return word.slice(0, -2);