zormz 1.4.1 → 1.4.3

package/dist/index.mjs

@@ -10,7 +10,7 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
 var Validator = class {
 };
 Validator.isValidTable = (val) => /^(?![0-9_])[a-z][a-z0-9_]{0,62}$/.test(val);
-Validator.isValidColumn = (val) => /^[a-z][a-z0-9_]{0,62}$/.test(val);
+Validator.isValidColumn = (val) => /^[a-zA-Z][a-zA-Z0-9]{0,62}$/.test(val);
 Validator.isValidUsername = (val) => /^[a-zA-Z0-9\-_]+$/.test(val);
 var RESERVED_WORDS = /* @__PURE__ */ new Set([
   "select",
@@ -154,7 +154,7 @@ function defineTable(tableName, columns) {
   const fn = () => tableName;
   if (!Validator.isValidTable(tableName)) {
     throw new Error(
-      "El nombre de la tabla no puede contener mayusculas o caracteres especiales"
+      "El nombre de la tabla no puede contener mayusculas o caracteres especiales : " + tableName
     );
   }
   if (RESERVED_WORDS.has(tableName)) {
@@ -181,7 +181,7 @@ function defineTable(tableName, columns) {
       if (prop === "toString") return () => tableName;
       if (prop === "valueOf") return () => tableName;
       if (prop in columns) {
-        return `${tableName}.${prop.toString()}`;
+        return tipoConexionZORMZ3691 === "mysql" ? `${tableName}.\`${prop.toString()}\` ` : `${tableName}."${prop.toString()}" `;
       }
       return void 0;
     },
@@ -203,14 +203,15 @@ function defineTable(tableName, columns) {
   });
   return proxy;
 }
-async function generateTable(tabla, columns) {
+async function generateTable(tabla, columns, seeSQL = false) {
   let queries = "";
   let columnDefs = [];
+  let cheksOut = [];
   let sql = "";
   let id = false;
   for (const columnName in columns) {
     const col = columns[columnName];
-    sql = ` ${columnName} `;
+    sql = tipoConexionZORMZ3691 === "mysql" ? `\`${columnName}\` ` : `"${columnName}" `;
     if (!col.typo) {
       throw new Error(`La columna ${columnName} no tiene el tipo definido`);
     }
@@ -224,16 +225,28 @@ async function generateTable(tabla, columns) {
     id = col.pk === true ? true : false;
     sql += col.sqlz;
     columnDefs.push(sql);
+    if (col.check !== void 0) {
+      cheksOut.push(
+        `CONSTRAINT chk_${columnName} CHECK (${columnName} IN ( ${col.check}))`
+      );
+    }
   }
   queries += `CREATE TABLE IF NOT EXISTS ${tabla} ( 
 `;
   queries += columnDefs.join(", \n");
+  if (cheksOut.length > 0) {
+    queries += ",\n";
+  }
+  queries += cheksOut.join(",\n");
   queries += ");";
   if (!conexionZORMZ3691 || !tipoConexionZORMZ3691) {
     throw new Error(
       "La conexi\xF3n no ha sido inicializada. Por favor, llama a getConexion() primero."
     );
   }
+  if (seeSQL) {
+    console.log(queries);
+  }
   if (tipoConexionZORMZ3691 === "mysql") {
     const response = await conexionZORMZ3691.executeConsulta({
       query: queries,
@@ -354,7 +367,6 @@ var QueryBuilder = class {
     this.tabla = tabla;
     this.parametros = parametros;
     this.valores = [];
-    this.valorRetorno = null;
     this.conexion = conexion;
   }
   /**
@@ -375,8 +387,11 @@ var QueryBuilder = class {
     this.valores = values;
     return this;
   }
+  Returning(idRetorno) {
+    this.returning = idRetorno;
+    return this;
+  }
   async execute(see = false) {
-    this.valorRetorno = 1;
     let query1 = `INSERT INTO ${this.tabla} `;
     let param = "";
     let arrayArrays = false;
@@ -438,15 +453,26 @@ var QueryBuilder = class {
         valores: arrayArrays ? [this.valores] : this.valores,
         mensaje: `Ocurrio un error al ingresar datos a ${this.tabla} `
       });
-      return respuesta.insertId;
+      let response = [];
+      if (this.returning !== void 0) {
+        for (let i = 0; i < this.valores.length; i++) {
+          response.push(respuesta.insertId + i);
+        }
+      }
+      return response;
     } else if (this.conexion.tipo === "pg") {
-      query += " RETURNING id ";
+      if (this.returning !== void 0)
+        query += ` RETURNING  ${this.returning} `;
       const respuesta = await this.conexion.executeConsulta({
         query,
         valores: this.valores,
         mensaje: `Ocurrio un error al ingresar datos a ${this.tabla} `
       });
-      return respuesta.rows;
+      let response = [];
+      if (respuesta.rows !== void 0) {
+        response = respuesta.rows.map((obj) => Object.values(obj)[0]);
+      }
+      return response;
     }
   }
 };
@@ -632,6 +658,14 @@ var eq = (valor1, valor2, literal = true) => {
   }
   return `${valor1} = '${valor2}'`;
 };
+var neq = (valor1, valor2, literal = true) => {
+  if (typeof valor1 === "string") valor1 = valor1.trim();
+  if (typeof valor2 === "string") valor2 = valor2.trim();
+  if (!literal) {
+    return `${valor1} != ${valor2}`;
+  }
+  return `${valor1} != '${valor2}'`;
+};
 var MAYOR = (valor, valor2) => {
   return ` ${valor} > ${valor2} `;
 };
@@ -692,7 +726,7 @@ var Update = class {
       }
     } else if (validate) {
       valores.forEach((valors) => {
-        valor += eq(valors.campoUp, valors.newCampoUp, !valors.dataTable);
+        valor += eq(valors.campoUp.replace(`${this.nombreTabla}.`, ""), valors.newCampoUp.replace(`${this.nombreTabla}.`, ""), !valors.dataTable);
         valor += ",";
       });
     }
@@ -723,7 +757,7 @@ var Update = class {
   async execute(seeQuery = false) {
     const query = `UPDATE ${this.nombreTabla} SET ${this.valores} ${this.condicion};`;
     if (seeQuery) {
-      console.log(seeQuery);
+      console.log(query);
     }
     const respuesta = await this.conexion.executeConsulta({
       query,
@@ -732,9 +766,7 @@ var Update = class {
     if (this.conexion.tipo === "mysql") {
       return respuesta.affectedRows;
     } else {
-      return {
-        resultado: respuesta.rowCount
-      };
+      return respuesta.rowCount;
     }
   }
 };
@@ -784,6 +816,7 @@ var IntColumn = class {
     this.unique = false;
     this.autoIncrement = false;
     this.unsingned = { uso: false, valor: 0 };
+    this.comentario = "";
   }
   Required() {
     this.requerido = true;
@@ -794,6 +827,10 @@ var IntColumn = class {
     this.pk = true;
     return this;
   }
+  Comment(comentario) {
+    this.comentario = comentario;
+    return this;
+  }
   Unique() {
     this.unique = true;
     return this;
@@ -852,6 +889,9 @@ var IntColumn = class {
       parts.push(`DEFAULT ${this.defaultData}`);
     }
     if (this.unique) parts.push("UNIQUE");
+    if (db === "mysql" && this.comentario.length > 2) {
+      parts.push(` COMMENT '${this.comentario}' `);
+    }
     const valor = {
       pk: false,
       typo: "int",
@@ -871,6 +911,9 @@ var Varchar = class {
     this.defaultData = "";
     this.requerido = false;
     this.unique = false;
+    this.enum = "";
+    this.campo = "";
+    this.comentarios = "";
     this.maxLenth = cantidad;
   }
   withType({
@@ -884,10 +927,27 @@ var Varchar = class {
     this.unique = unique;
     return this.Default(defaultData).$();
   }
+  /**
+   * 
+   * @param {string} campo 
+   * @param {string[]} datos
+   * @example
+   * Check("example", ["operativo","denegado","revisando"]) 
+   * 
+   * @returns 
+   */
+  Check(datos) {
+    this.enum = datos.map((caracter) => `'${caracter}'`).join(",");
+    return this;
+  }
   Required() {
     this.requerido = true;
     return this;
   }
+  Comment(comentario) {
+    this.comentarios = comentario;
+    return this;
+  }
   Unique() {
     this.unique = true;
     return this;
@@ -902,11 +962,16 @@ var Varchar = class {
     return this;
   }
   $() {
-    let sqlz = `VARCHAR(${this.maxLenth}) ${this.requerido ? "NOT NULL" : "NULL"} ${this.defaultData.length > 0 ? ` DEFAULT ${this.defaultData} ` : " "} ${this.unique ? " UNIQUE" : " "} `;
+    let sqlz = `VARCHAR(${this.maxLenth}) ${this.requerido ? "NOT NULL" : "NULL"} ${this.defaultData.length > 0 ? ` DEFAULT ${this.defaultData} ` : " "} ${this.unique ? " UNIQUE" : " "}`;
+    const db = getTipoConexion();
+    if (db === "mysql" && this.comentarios.length > 2) {
+      sqlz += ` COMMENT '${this.comentarios}' `;
+    }
     const response = {
       typo: "varchar",
       pk: false,
-      sqlz
+      sqlz,
+      check: this.enum.length > 2 ? this.enum : void 0
     };
     return response;
   }
@@ -919,11 +984,16 @@ function varchar(cantidad = 100) {
 var BoolColumn = class {
   constructor() {
     this.requerido = false;
+    this.comentario = "";
   }
   required() {
     this.requerido = true;
     return this;
   }
+  Comment(comentario) {
+    this.comentario = comentario;
+    return this;
+  }
   default(value) {
     this.defaultData = value;
     return this;
@@ -938,6 +1008,9 @@ var BoolColumn = class {
         `DEFAULT ${db === "mysql" ? this.defaultData ? 1 : 0 : this.defaultData}`
       );
     }
+    if (db === "mysql" && this.comentario.length > 2) {
+      parts.push(` COMMENT '${this.comentario}' `);
+    }
     const response = {
       typo: "bool",
       pk: false,
@@ -956,11 +1029,16 @@ var Timestamp = class {
     this.requerido = false;
     this.defaultNow = false;
     this.onUpdateNow = false;
+    this.comentario = "";
   }
   required() {
     this.requerido = true;
     return this;
   }
+  comment(comentario) {
+    this.comentario = comentario;
+    return this;
+  }
   now() {
     this.defaultNow = true;
     return this;
@@ -980,6 +1058,9 @@ var Timestamp = class {
     if (this.onUpdateNow && db === "mysql") {
       parts.push("ON UPDATE CURRENT_TIMESTAMP");
     }
+    if (db === "mysql" && this.comentario.length > 2) {
+      parts.push(` COMMENT '${this.comentario}' `);
+    }
     const response = {
       typo: "timestamp",
       pk: false,
@@ -998,6 +1079,7 @@ var Money = class {
     this.precision = 10;
     this.scale = 2;
     this.requerido = false;
+    this.comentario = "";
     this.precision = presicion;
     this.scale = decimales;
   }
@@ -1009,6 +1091,10 @@ var Money = class {
     this.defaultData = value;
     return this;
   }
+  comment(comentario) {
+    this.comentario = comentario;
+    return this;
+  }
   $() {
     const parts = [];
     const db = getTipoConexion();
@@ -1019,6 +1105,9 @@ var Money = class {
     if (this.defaultData !== void 0) {
       parts.push(`DEFAULT ${this.defaultData.toFixed(this.scale)}`);
     }
+    if (db === "mysql" && this.comentario.length > 2) {
+      parts.push(` COMMENT '${this.comentario}' `);
+    }
     const response = {
       typo: "money",
       pk: false,
@@ -1058,6 +1147,7 @@ export {
   getTipoConexion,
   int,
   money,
+  neq,
   timestamp,
   varchar
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "zormz",
-    "version": "1.4.1",
+    "version": "1.4.3",
     "description": "Un ORM que busca ser ligero y facil de usar",
     "author": "yukio-kayaba",
     "license": "ISC",