zormz 1.4.1 → 1.4.3

package/dist/index.d.ts

@@ -12,6 +12,7 @@ interface ColumnDefinition<T extends ColumnTypes = ColumnTypes> {
   typo: T;
   pk?: boolean;
   sqlz: string;
+  check?: string
 }
 
 interface VarcharType{
@@ -83,25 +84,17 @@ type TableProxy<TCols> = {
  * @param {string} tableName
  * @param {string} columns
  * @example
- * export const productosPrueba = defineTable("productosPrueba",{
- *  id:{typo:"int",id:true},
-    dato: {
-        typo:"varchar",
-        maxLength:200,
-        default:"hola mundo"
-    },
-    edad: {
-        typo:"int",
-        default: 0,
-    },
-    apellido : {
-        typo:"varchar",
-    }
+ * export const categorias = defineTable("categorias", {
+       idcategoria: int().Pk().$(),
+       nombrecategoria: varchar(100).Check(['disponible','data']).Required().$(),
+       descripcion: varchar(250).$(),
+       estado: bool().default(true).$(),
+     })
  * });
  * @returns
  */
 declare function defineTable<T extends Record<string, ColumnDefinition>>(tableName: string, columns: T): TableProxy<T>;
-declare function generateTable<T extends Record<string, ColumnDefinition>>(tabla: string, columns: T): Promise<void>;
+declare function generateTable<T extends Record<string, ColumnDefinition>>(tabla: string, columns: T, seeSQL?: boolean): Promise<void>;
 declare function dropTable(nombreTabla: string): Promise<void>;
 
 declare class DeleteR {
@@ -131,7 +124,7 @@ declare class QueryBuilder {
     private tabla;
     private parametros;
     private valores;
-    private valorRetorno;
+    private returning;
     private conexion;
     /**
      * @throws {Error} Si la consulta es vacía.
@@ -154,7 +147,8 @@ declare class QueryBuilder {
      * @returns
      */
     Values(values: arrayData | arrayDatas): this;
-    execute(see?: boolean): Promise<number | any[] | undefined>;
+    Returning(idRetorno: string): this;
+    execute(see?: boolean): Promise<any[] | undefined>;
 }
 
 type valor = "ASC" | "DESC";
@@ -344,6 +338,19 @@ declare const NOTNULL: (variable: string) => string;
  * eq('id',valor1, false)
  */
 declare const eq: (valor1: Valor, valor2: Valor, literal?: boolean) => string;
+/**
+ *
+ * @param {(string | number | boolean )} valor1 - primer valor
+ * @param {(string | number | boolean )} valor2 - segundo valor
+ * @param {(boolean )} literal
+ *
+ * @example
+ * //en caso sea un valores normalres
+ * neq('id','1')
+ * //en caso de que seaq un valor de tabla columna
+ * neq('id',valor1, false)
+ */
+declare const neq: (valor1: Valor, valor2: Valor, literal?: boolean) => string;
 /**
  *
  * @param {string} valor
@@ -392,9 +399,11 @@ declare class IntColumn {
     private defaultData?;
     private pk?;
     private unsingned;
+    private comentario;
     constructor();
     Required(): this;
     Pk(): this;
+    Comment(comentario: string): this;
     Unique(): this;
     Unsingned(numeroPositivosInicio?: number): this;
     AutoIncrement(): this;
@@ -409,9 +418,23 @@ declare class Varchar {
     private defaultData;
     private requerido;
     private unique;
+    private enum;
+    private campo;
+    private comentarios;
     constructor(cantidad?: number);
     withType({ maxLenth, defaultData, requerido, unique, }: VarcharType): ColumnDefinition<ColumnTypes>;
+    /**
+     *
+     * @param {string} campo
+     * @param {string[]} datos
+     * @example
+     * Check("example", ["operativo","denegado","revisando"])
+     *
+     * @returns
+     */
+    Check(datos: (string)[]): this;
     Required(): this;
+    Comment(comentario: string): this;
     Unique(): this;
     Default(textoDefecto: string): this;
     $(): ColumnDefinition<ColumnTypes>;
@@ -421,7 +444,9 @@ declare function varchar(cantidad?: number): Varchar;
 declare class BoolColumn {
     private requerido;
     private defaultData?;
+    private comentario;
     required(): this;
+    Comment(comentario: string): this;
     default(value: boolean): this;
     $(): ColumnDefinition;
 }
@@ -431,7 +456,9 @@ declare class Timestamp {
     private requerido;
     private defaultNow;
     private onUpdateNow;
+    private comentario;
     required(): this;
+    comment(comentario: string): this;
     now(): this;
     onUpdate(): this;
     $(): ColumnDefinition<ColumnTypes>;
@@ -443,11 +470,13 @@ declare class Money {
     private scale;
     private requerido;
     private defaultData?;
+    private comentario;
     constructor(presicion?: number, decimales?: number);
     required(): this;
     default(value: number): this;
+    comment(comentario: string): this;
     $(): ColumnDefinition<ColumnTypes>;
 }
 declare function money(presicion?: number, decimales?: number): Money;
 
-export { AND, BDconnection, CURRENT_TIMESTAMP, type Consultas, DB, DeleteR, ILIKE, MAYOR, MENOR, NOTNULL, NOW, NULL, OR, ORQ, QueryBuilder, Select, type TableProxy, type Tipos, UP, Update, type Valores, type arrayData, type arrayDatas, bool, type connecionLocal, type connecionRed, type connectionDB, defineTable, dropTable, eq, generateTable, getConexion, getRed, getTipoConexion, int, money, timestamp, type valor, varchar };
+export { AND, BDconnection, CURRENT_TIMESTAMP, type Consultas, DB, DeleteR, ILIKE, MAYOR, MENOR, NOTNULL, NOW, NULL, OR, ORQ, QueryBuilder, Select, type TableProxy, type Tipos, UP, Update, type Valores, type arrayData, type arrayDatas, bool, type connecionLocal, type connecionRed, type connectionDB, defineTable, dropTable, eq, generateTable, getConexion, getRed, getTipoConexion, int, money, neq, timestamp, type valor, varchar };

package/dist/index.js

@@ -64,6 +64,7 @@ __export(index_exports, {
   getTipoConexion: () => getTipoConexion,
   int: () => int,
   money: () => money,
+  neq: () => neq,
   timestamp: () => timestamp,
   varchar: () => varchar
 });
@@ -73,7 +74,7 @@ module.exports = __toCommonJS(index_exports);
 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",
@@ -217,7 +218,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)) {
@@ -244,7 +245,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;
     },
@@ -266,14 +267,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`);
     }
@@ -287,16 +289,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,
@@ -417,7 +431,6 @@ var QueryBuilder = class {
     this.tabla = tabla;
     this.parametros = parametros;
     this.valores = [];
-    this.valorRetorno = null;
     this.conexion = conexion;
   }
   /**
@@ -438,8 +451,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;
@@ -501,15 +517,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;
     }
   }
 };
@@ -695,6 +722,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} `;
 };
@@ -755,7 +790,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 += ",";
       });
     }
@@ -786,7 +821,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,
@@ -795,9 +830,7 @@ var Update = class {
     if (this.conexion.tipo === "mysql") {
       return respuesta.affectedRows;
     } else {
-      return {
-        resultado: respuesta.rowCount
-      };
+      return respuesta.rowCount;
     }
   }
 };
@@ -847,6 +880,7 @@ var IntColumn = class {
     this.unique = false;
     this.autoIncrement = false;
     this.unsingned = { uso: false, valor: 0 };
+    this.comentario = "";
   }
   Required() {
     this.requerido = true;
@@ -857,6 +891,10 @@ var IntColumn = class {
     this.pk = true;
     return this;
   }
+  Comment(comentario) {
+    this.comentario = comentario;
+    return this;
+  }
   Unique() {
     this.unique = true;
     return this;
@@ -915,6 +953,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",
@@ -934,6 +975,9 @@ var Varchar = class {
     this.defaultData = "";
     this.requerido = false;
     this.unique = false;
+    this.enum = "";
+    this.campo = "";
+    this.comentarios = "";
     this.maxLenth = cantidad;
   }
   withType({
@@ -947,10 +991,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;
@@ -965,11 +1026,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;
   }
@@ -982,11 +1048,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;
@@ -1001,6 +1072,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,
@@ -1019,11 +1093,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;
@@ -1043,6 +1122,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,
@@ -1061,6 +1143,7 @@ var Money = class {
     this.precision = 10;
     this.scale = 2;
     this.requerido = false;
+    this.comentario = "";
     this.precision = presicion;
     this.scale = decimales;
   }
@@ -1072,6 +1155,10 @@ var Money = class {
     this.defaultData = value;
     return this;
   }
+  comment(comentario) {
+    this.comentario = comentario;
+    return this;
+  }
   $() {
     const parts = [];
     const db = getTipoConexion();
@@ -1082,6 +1169,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,
@@ -1122,6 +1212,7 @@ function money(presicion = 10, decimales = 2) {
   getTipoConexion,
   int,
   money,
+  neq,
   timestamp,
   varchar
 });