zormz 1.2.4 → 1.2.5

package/dist/{index.d.cts → index.d.mts}

@@ -1,3 +1,45 @@
+interface ResultSetHeaderMysql {
+  fieldCount: number;
+  affectedRows: number;
+  insertId: number;
+  info: string;
+  serverStatus: number;
+  warningStatus: number;
+  changedRows: number;
+}
+
+type ColumnTypes =
+  | "varchar"
+  | "int"
+  | "double"
+  | "bool"
+  | "timestamp"
+  | "float"
+  | "money";
+
+
+interface ColumnDefinition<T extends ColumnTypes = ColumnTypes> {
+  typo: T;
+  pk?: boolean;
+  sqlz: string;
+}
+
+interface VarcharType{
+  maxLenth?:number,
+  defaultData?:string,
+  requerido?:boolean
+  unique?:boolean
+}
+
+type IntType = {
+  defaultData?: number;
+  id?:boolean;
+  requerido?: boolean;
+  unique?: boolean;
+  unsingned:number; 
+  autoIncrement?: boolean;
+};
+
 interface connecionLocal {
     host: string;
     port: number;
@@ -14,6 +56,7 @@ interface connecionRed {
     connectionString: string;
 }
 type connectionDB = "mysql" | "pg";
+declare function getTipoConexion(): connectionDB;
 declare class BDconnection {
     tipo: connectionDB;
     pool: any;
@@ -31,23 +74,6 @@ declare class BDconnection {
  */
 declare function getConexion(bd: connectionDB, datos: connecionLocal | connecionRed): Promise<void>;
 declare function getRed(): BDconnection;
-type ColumnTypes = "varchar" | "int" | "double" | "bool" | "timestamp" | "float" | "money";
-type ColumnTypeMap = {
-    varchar: string;
-    double: number;
-    int: number;
-    bool: boolean;
-    timestamp: Date;
-    float: number;
-    money: number;
-};
-interface ColumnDefinition<T extends ColumnTypes = ColumnTypes> {
-    typo: T;
-    id?: boolean;
-    maxLength?: number;
-    default?: ColumnTypeMap[T];
-    unique?: boolean;
-}
 type TableProxy<TCols> = {
     (): string;
     $columns: TCols;
@@ -132,16 +158,6 @@ declare class QueryBuilder {
     execute(): Promise<number | any[] | undefined>;
 }
 
-interface ResultSetHeaderMysql {
-  fieldCount: number;
-  affectedRows: number;
-  insertId: number;
-  info: string;
-  serverStatus: number;
-  warningStatus: number;
-  changedRows: number;
-}
-
 type valor = "ASC" | "DESC";
 type Tipos = {
     [clave: string]: valor;
@@ -357,4 +373,69 @@ declare const MENOR: (valor: string, valor2: string) => string;
  */
 declare const CURRENT_TIMESTAMP: () => string;
 
-export { AND, BDconnection, CURRENT_TIMESTAMP, type ColumnDefinition, type Consultas, DB, DeleteR, ILIKE, MAYOR, MENOR, NOTNULL, NOW, NULL, OR, ORQ, QueryBuilder, Select, type TableProxy, type Tipos, Update, type Valores, type arrayData, type arrayDatas, type connecionLocal, type connecionRed, type connectionDB, defineTable, eq, generateTable, getConexion, getRed, type valor };
+declare class IntColumn {
+    private requerido;
+    private unique;
+    private autoIncrement;
+    private defaultData?;
+    private pk?;
+    private unsingned;
+    constructor();
+    Required(): this;
+    Pk(): this;
+    Unique(): this;
+    Unsingned(numeroPositivosInicio?: number): void;
+    AutoIncrement(): this;
+    Default(value: number): this;
+    withType({ defaultData, id, requerido, unique, autoIncrement }: IntType): this;
+    $(): ColumnDefinition;
+}
+declare function int(): IntColumn;
+
+declare class Varchar {
+    private maxLenth;
+    private defaultData;
+    private requerido;
+    private unique;
+    constructor(cantidad?: number);
+    withType({ maxLenth, defaultData, requerido, unique, }: VarcharType): ColumnDefinition<undefined>;
+    Required(): this;
+    Unique(): this;
+    Default(textoDefecto: string): this;
+    $(): ColumnDefinition<undefined>;
+}
+declare function varchar(cantidad?: number): Varchar;
+
+declare class BoolColumn {
+    private requerido;
+    private defaultData?;
+    required(): this;
+    default(value: boolean): this;
+    $(): ColumnDefinition;
+}
+declare function bool(): BoolColumn;
+
+declare class Timestamp {
+    private requerido;
+    private defaultNow;
+    private onUpdateNow;
+    required(): this;
+    now(): this;
+    onUpdate(): this;
+    $(): ColumnDefinition<undefined>;
+}
+declare function timestamp(): Timestamp;
+
+declare class Money {
+    private precision;
+    private scale;
+    private requerido;
+    private defaultData?;
+    constructor(presicion?: number, decimales?: number);
+    required(): this;
+    default(value: number): this;
+    $(): ColumnDefinition<undefined>;
+}
+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, Update, type Valores, type arrayData, type arrayDatas, bool, type connecionLocal, type connecionRed, type connectionDB, defineTable, eq, generateTable, getConexion, getRed, getTipoConexion, int, money, timestamp, type valor, varchar };

package/dist/index.d.ts

@@ -1,3 +1,45 @@
+interface ResultSetHeaderMysql {
+  fieldCount: number;
+  affectedRows: number;
+  insertId: number;
+  info: string;
+  serverStatus: number;
+  warningStatus: number;
+  changedRows: number;
+}
+
+type ColumnTypes =
+  | "varchar"
+  | "int"
+  | "double"
+  | "bool"
+  | "timestamp"
+  | "float"
+  | "money";
+
+
+interface ColumnDefinition<T extends ColumnTypes = ColumnTypes> {
+  typo: T;
+  pk?: boolean;
+  sqlz: string;
+}
+
+interface VarcharType{
+  maxLenth?:number,
+  defaultData?:string,
+  requerido?:boolean
+  unique?:boolean
+}
+
+type IntType = {
+  defaultData?: number;
+  id?:boolean;
+  requerido?: boolean;
+  unique?: boolean;
+  unsingned:number; 
+  autoIncrement?: boolean;
+};
+
 interface connecionLocal {
     host: string;
     port: number;
@@ -14,6 +56,7 @@ interface connecionRed {
     connectionString: string;
 }
 type connectionDB = "mysql" | "pg";
+declare function getTipoConexion(): connectionDB;
 declare class BDconnection {
     tipo: connectionDB;
     pool: any;
@@ -31,23 +74,6 @@ declare class BDconnection {
  */
 declare function getConexion(bd: connectionDB, datos: connecionLocal | connecionRed): Promise<void>;
 declare function getRed(): BDconnection;
-type ColumnTypes = "varchar" | "int" | "double" | "bool" | "timestamp" | "float" | "money";
-type ColumnTypeMap = {
-    varchar: string;
-    double: number;
-    int: number;
-    bool: boolean;
-    timestamp: Date;
-    float: number;
-    money: number;
-};
-interface ColumnDefinition<T extends ColumnTypes = ColumnTypes> {
-    typo: T;
-    id?: boolean;
-    maxLength?: number;
-    default?: ColumnTypeMap[T];
-    unique?: boolean;
-}
 type TableProxy<TCols> = {
     (): string;
     $columns: TCols;
@@ -132,16 +158,6 @@ declare class QueryBuilder {
     execute(): Promise<number | any[] | undefined>;
 }
 
-interface ResultSetHeaderMysql {
-  fieldCount: number;
-  affectedRows: number;
-  insertId: number;
-  info: string;
-  serverStatus: number;
-  warningStatus: number;
-  changedRows: number;
-}
-
 type valor = "ASC" | "DESC";
 type Tipos = {
     [clave: string]: valor;
@@ -357,4 +373,69 @@ declare const MENOR: (valor: string, valor2: string) => string;
  */
 declare const CURRENT_TIMESTAMP: () => string;
 
-export { AND, BDconnection, CURRENT_TIMESTAMP, type ColumnDefinition, type Consultas, DB, DeleteR, ILIKE, MAYOR, MENOR, NOTNULL, NOW, NULL, OR, ORQ, QueryBuilder, Select, type TableProxy, type Tipos, Update, type Valores, type arrayData, type arrayDatas, type connecionLocal, type connecionRed, type connectionDB, defineTable, eq, generateTable, getConexion, getRed, type valor };
+declare class IntColumn {
+    private requerido;
+    private unique;
+    private autoIncrement;
+    private defaultData?;
+    private pk?;
+    private unsingned;
+    constructor();
+    Required(): this;
+    Pk(): this;
+    Unique(): this;
+    Unsingned(numeroPositivosInicio?: number): void;
+    AutoIncrement(): this;
+    Default(value: number): this;
+    withType({ defaultData, id, requerido, unique, autoIncrement }: IntType): this;
+    $(): ColumnDefinition;
+}
+declare function int(): IntColumn;
+
+declare class Varchar {
+    private maxLenth;
+    private defaultData;
+    private requerido;
+    private unique;
+    constructor(cantidad?: number);
+    withType({ maxLenth, defaultData, requerido, unique, }: VarcharType): ColumnDefinition<undefined>;
+    Required(): this;
+    Unique(): this;
+    Default(textoDefecto: string): this;
+    $(): ColumnDefinition<undefined>;
+}
+declare function varchar(cantidad?: number): Varchar;
+
+declare class BoolColumn {
+    private requerido;
+    private defaultData?;
+    required(): this;
+    default(value: boolean): this;
+    $(): ColumnDefinition;
+}
+declare function bool(): BoolColumn;
+
+declare class Timestamp {
+    private requerido;
+    private defaultNow;
+    private onUpdateNow;
+    required(): this;
+    now(): this;
+    onUpdate(): this;
+    $(): ColumnDefinition<undefined>;
+}
+declare function timestamp(): Timestamp;
+
+declare class Money {
+    private precision;
+    private scale;
+    private requerido;
+    private defaultData?;
+    constructor(presicion?: number, decimales?: number);
+    required(): this;
+    default(value: number): this;
+    $(): ColumnDefinition<undefined>;
+}
+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, Update, type Valores, type arrayData, type arrayDatas, bool, type connecionLocal, type connecionRed, type connectionDB, defineTable, eq, generateTable, getConexion, getRed, getTipoConexion, int, money, timestamp, type valor, varchar };

package/dist/index.js

@@ -1,14 +1,78 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __typeError = (msg) => {
   throw TypeError(msg);
 };
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
 var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
 var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
 
+// index.ts
+var index_exports = {};
+__export(index_exports, {
+  AND: () => AND,
+  BDconnection: () => BDconnection,
+  CURRENT_TIMESTAMP: () => CURRENT_TIMESTAMP,
+  DB: () => DB,
+  DeleteR: () => DeleteR,
+  ILIKE: () => ILIKE,
+  MAYOR: () => MAYOR,
+  MENOR: () => MENOR,
+  NOTNULL: () => NOTNULL,
+  NOW: () => NOW,
+  NULL: () => NULL,
+  OR: () => OR,
+  ORQ: () => ORQ,
+  QueryBuilder: () => QueryBuilder,
+  Select: () => Select,
+  Update: () => Update,
+  bool: () => bool,
+  defineTable: () => defineTable,
+  eq: () => eq,
+  generateTable: () => generateTable,
+  getConexion: () => getConexion,
+  getRed: () => getRed,
+  getTipoConexion: () => getTipoConexion,
+  int: () => int,
+  money: () => money,
+  timestamp: () => timestamp,
+  varchar: () => varchar
+});
+module.exports = __toCommonJS(index_exports);
+
 // conection/db.ts
 var conexionZORMZ3691;
 var tipoConexionZORMZ3691;
+function getTipoConexion() {
+  return tipoConexionZORMZ3691;
+}
 var BDconnection = class {
   constructor(bd, datos) {
     this.tipo = "pg";
@@ -144,29 +208,6 @@ function defineTable(tableName, columns) {
   });
   return proxy;
 }
-function ValidacionTypos(columna, id, maxLength) {
-  let sql = "";
-  if (columna === "varchar")
-    sql += `VARCHAR(${maxLength ? maxLength : "100"})`;
-  if (columna === "int") {
-    if (tipoConexionZORMZ3691 === "pg") {
-      sql += id ? " " : " INTEGER ";
-    } else {
-      sql += " INT ";
-    }
-  }
-  if (columna === "bool")
-    sql += tipoConexionZORMZ3691 === "mysql" ? " TINYINT(1) " : " BOOLEAN ";
-  if (columna === "double")
-    sql += tipoConexionZORMZ3691 === "mysql" ? " DOUBLE " : " DOUBLE PRECISION ";
-  if (columna === "timestamp")
-    sql += tipoConexionZORMZ3691 === "mysql" ? " TIMESTAMP " : " TIMESTAMPTZ ";
-  if (columna === "float")
-    sql += tipoConexionZORMZ3691 === "mysql" ? " FLOAT " : " REAL";
-  if (columna === "money")
-    sql += tipoConexionZORMZ3691 === "mysql" ? " DECIMAL(10,2) " : " NUMERIC(10,2)";
-  return sql;
-}
 async function generateTable(tabla, columns) {
   let queries = "";
   let columnDefs = [];
@@ -178,17 +219,15 @@ async function generateTable(tabla, columns) {
     if (!col.typo) {
       throw new Error(`La columna ${columnName} no tiene el tipo definido`);
     }
-    sql += ValidacionTypos(col.typo, col.id, col.maxLength);
-    if (col.id) {
-      if (id) throw new Error(`El id no puede repetirse en 2 campos de la tabla '${tabla}'`);
-      sql += tipoConexionZORMZ3691 === "mysql" ? " NOT NULL AUTO_INCREMENT " : " SERIAL ";
-      sql += " PRIMARY KEY ";
-      id = true;
-      columnDefs.push(sql);
-      continue;
-    }
-    sql += col.unique === void 0 ? " NOT NULL " : " UNIQUE";
-    sql += col.default === void 0 ? col.unique === void 0 ? " " : " NOT NULL " : ` DEFAULT ${typeof col.default === "string" ? tipoConexionZORMZ3691 === "mysql" ? `"${col.default}"` : `'${col.default}'` : col.default}`;
+    if (col.typo === "int") {
+      let valorSql = col.sqlz.replace("$ZORMZ", columnName);
+      col.sqlz = valorSql;
+    }
+    if (id && col.pk === true) {
+      throw new Error("El id es unico por fila");
+    }
+    id = col.pk === true ? true : false;
+    sql += col.sqlz;
     columnDefs.push(sql);
   }
   queries += `CREATE TABLE IF NOT EXISTS ${tabla} ( 
@@ -212,6 +251,185 @@ async function generateTable(tabla, columns) {
   }
 }
 
+// conection/controls/int.ts
+var IntColumn = class {
+  constructor() {
+    this.requerido = false;
+    this.unique = false;
+    this.autoIncrement = false;
+    this.unsingned = { uso: false, valor: 0 };
+  }
+  Required() {
+    this.requerido = true;
+    return this;
+  }
+  Pk() {
+    this.autoIncrement = true;
+    this.pk = true;
+    return this;
+  }
+  Unique() {
+    this.unique = true;
+    return this;
+  }
+  Unsingned(numeroPositivosInicio = 0) {
+    if (numeroPositivosInicio != void 0 && numeroPositivosInicio < 0) {
+      throw new Error(" Unsingned() solo permite numeros positivos ");
+    }
+    this.unsingned.uso = true;
+    this.unsingned.valor = numeroPositivosInicio;
+  }
+  AutoIncrement() {
+    this.autoIncrement = true;
+    this.requerido = true;
+    return this;
+  }
+  Default(value) {
+    this.defaultData = value;
+    return this;
+  }
+  withType({ defaultData, id = false, requerido, unique, autoIncrement }) {
+    if (defaultData !== void 0) this.Default(defaultData);
+    if (requerido) this.Required();
+    if (unique) this.Unique();
+    if (autoIncrement) this.AutoIncrement();
+    return this;
+  }
+  $() {
+    const parts = [];
+    const db = getTipoConexion();
+    parts.push(db === "mysql" ? "INT" : "INTEGER");
+    if (this.unsingned.uso) {
+      parts.push(
+        db === "mysql" ? "UNSIGNED" : ` CHECK ( $ZORMZ >= ${this.unsingned.valor}) `
+      );
+    }
+    parts.push(
+      this.requerido ? "NOT NULL" : db === "pg" && this.pk ? " " : "NULL"
+    );
+    if (this.autoIncrement) {
+      parts.push(
+        db === "pg" ? "GENERATED ALWAYS AS IDENTITY" : "AUTO_INCREMENT"
+      );
+    }
+    if (this.pk) {
+      parts.push("PRIMARY KEY");
+      const valor2 = {
+        pk: true,
+        typo: "int",
+        sqlz: parts.join(" ")
+      };
+      return valor2;
+    }
+    if (this.defaultData !== void 0 && !this.autoIncrement) {
+      parts.push(`DEFAULT ${this.defaultData}`);
+    }
+    if (this.unique) parts.push("UNIQUE");
+    const valor = {
+      pk: false,
+      typo: "int",
+      sqlz: parts.join(" ")
+    };
+    return valor;
+  }
+};
+function int() {
+  return new IntColumn();
+}
+
+// conection/controls/timestamp.ts
+var Timestamp = class {
+  constructor() {
+    this.requerido = false;
+    this.defaultNow = false;
+    this.onUpdateNow = false;
+  }
+  required() {
+    this.requerido = true;
+    return this;
+  }
+  now() {
+    this.defaultNow = true;
+    return this;
+  }
+  onUpdate() {
+    this.onUpdateNow = true;
+    return this;
+  }
+  $() {
+    const parts = [];
+    const db = getTipoConexion();
+    parts.push(db === "mysql" ? "TIMESTAMP" : "TIMESTAMPTZ");
+    parts.push(this.requerido ? "NOT NULL" : "NULL");
+    if (this.defaultNow) {
+      parts.push(`DEFAULT ${db === "mysql" ? "CURRENT_TIMESTAMP" : "NOW()"}`);
+    }
+    if (this.onUpdateNow && db === "mysql") {
+      parts.push("ON UPDATE CURRENT_TIMESTAMP");
+    }
+    const response = {
+      typo: "timestamp",
+      pk: false,
+      sqlz: parts.join(" ")
+    };
+    return response;
+  }
+};
+function timestamp() {
+  return new Timestamp();
+}
+
+// conection/controls/varchar.ts
+var Varchar = class {
+  constructor(cantidad = 100) {
+    this.maxLenth = 100;
+    this.defaultData = "";
+    this.requerido = false;
+    this.unique = false;
+    this.maxLenth = cantidad;
+  }
+  withType({
+    maxLenth = 100,
+    defaultData = "",
+    requerido = false,
+    unique = false
+  }) {
+    this.maxLenth = maxLenth;
+    this.requerido = requerido;
+    this.unique = unique;
+    return this.Default(defaultData).$();
+  }
+  Required() {
+    this.requerido = true;
+    return this;
+  }
+  Unique() {
+    this.unique = true;
+    return this;
+  }
+  Default(textoDefecto) {
+    let opcion = getTipoConexion();
+    if (opcion === "mysql") {
+      this.defaultData = ` "${textoDefecto}" `;
+    } else if (opcion === "pg") {
+      this.defaultData = ` '${textoDefecto}' `;
+    }
+    return this;
+  }
+  $() {
+    let sqlz = `VARCHAR(${this.maxLenth}) ${this.requerido ? "NOT NULL" : "NULL"} ${this.defaultData.length > 0 ? ` DEFAULT ${this.defaultData} ` : " "} ${this.unique ? " UNIQUE" : " "} `;
+    const response = {
+      typo: "varchar",
+      pk: false,
+      sqlz
+    };
+    return response;
+  }
+};
+function varchar(cantidad = 100) {
+  return new Varchar(cantidad);
+}
+
 // conection/middleware/delete.ts
 var _condicion, _tabla;
 var DeleteR = class {
@@ -221,12 +439,12 @@ var DeleteR = class {
    * @example
    * delete from tabla
    */
-  constructor(conexion, tabla) {
+  constructor(conexion2, tabla) {
     __privateAdd(this, _condicion);
     __privateAdd(this, _tabla);
     __privateSet(this, _tabla, tabla);
     __privateSet(this, _condicion, "");
-    this.conexion = conexion;
+    this.conexion = conexion2;
   }
   /**
    *
@@ -272,7 +490,7 @@ var QueryBuilder = class {
    * @param {string} tabla - nombre de la ta tabla - campo obligatorio
    * @param {string[]} values - campo obligatorio
    */
-  constructor(conexion, tabla, parametros) {
+  constructor(conexion2, tabla, parametros) {
     if (!parametros || !Array.isArray(parametros)) {
       throw new Error(`campos obligatorios`);
     }
@@ -283,7 +501,7 @@ var QueryBuilder = class {
     this.parametros = parametros;
     this.valores = [];
     this.valorRetorno = null;
-    this.conexion = conexion;
+    this.conexion = conexion2;
   }
   /**
    *
@@ -383,8 +601,8 @@ var Select = class {
    * @param {string[]} values - campo obligatorio
    * @param {string} condition - tabla1.id = tabla2.idtabla1 - id='2' - id='2' AND id='3'
    */
-  constructor(conexion, parametros = "*") {
-    this.conexion = conexion;
+  constructor(conexion2, parametros = "*") {
+    this.conexion = conexion2;
     this.valores = !Array.isArray(parametros) ? false : true;
     this.parametros = parametros;
     this.tabla = void 0;
@@ -568,7 +786,7 @@ var Update = class {
   /**
    * @param {string} nombreTabla - nombre de la tabla a actualizar
    */
-  constructor(conexion, nombreTabla) {
+  constructor(conexion2, nombreTabla) {
     this.nombreTabla = "";
     this.valores = "";
     this.condicion = "";
@@ -579,7 +797,7 @@ var Update = class {
       throw new Error("El nombre de la tabla es requerido");
     }
     this.nombreTabla = nombreTabla;
-    this.conexion = conexion;
+    this.conexion = conexion2;
   }
   /**
    * @param {Valores} valores - valores a actualizar
@@ -676,7 +894,100 @@ var DB = class {
     return new DeleteR(conex, nombreTabla);
   }
 };
-export {
+
+// conection/controls/bool.ts
+var BoolColumn = class {
+  constructor() {
+    this.requerido = false;
+  }
+  required() {
+    this.requerido = true;
+    return this;
+  }
+  default(value) {
+    this.defaultData = value;
+    return this;
+  }
+  $() {
+    const parts = [];
+    const db = getTipoConexion();
+    parts.push("BOOLEAN");
+    parts.push(this.requerido ? "NOT NULL" : "NULL");
+    if (this.defaultData !== void 0) {
+      parts.push(
+        `DEFAULT ${db === "mysql" ? this.defaultData ? 1 : 0 : this.defaultData}`
+      );
+    }
+    const response = {
+      typo: "bool",
+      pk: false,
+      sqlz: parts.join(" ")
+    };
+    return response;
+  }
+};
+function bool() {
+  return new BoolColumn();
+}
+
+// conection/controls/money.ts
+var Money = class {
+  constructor(presicion = 10, decimales = 2) {
+    this.precision = 10;
+    this.scale = 2;
+    this.requerido = false;
+    this.precision = presicion;
+    this.scale = decimales;
+  }
+  required() {
+    this.requerido = true;
+    return this;
+  }
+  default(value) {
+    this.defaultData = value;
+    return this;
+  }
+  $() {
+    const parts = [];
+    const db = getTipoConexion();
+    parts.push(
+      db === "mysql" ? `DECIMAL(${this.precision},${this.scale})` : `NUMERIC(${this.precision},${this.scale})`
+    );
+    parts.push(this.requerido ? "NOT NULL" : "NULL");
+    if (this.defaultData !== void 0) {
+      parts.push(`DEFAULT ${this.defaultData.toFixed(this.scale)}`);
+    }
+    const response = {
+      typo: "money",
+      pk: false,
+      sqlz: parts.join(" ")
+    };
+    return response;
+  }
+};
+function money(presicion = 10, decimales = 2) {
+  return new Money(presicion, decimales);
+}
+
+// index.ts
+var conexion = {
+  database: "pruebamaster",
+  host: "localhost",
+  password: "zainmaster123",
+  port: 5432,
+  user: "postgres"
+};
+getConexion("pg", conexion);
+var prueba1 = defineTable("prueba1", {
+  id: int().Pk().$(),
+  valor: varchar(200).Default("hola").$(),
+  resultado: int().Default(0).$(),
+  fechaRegistro: timestamp().required().now().$(),
+  fechaUpdate: timestamp().required().now().onUpdate().$()
+});
+generateTable(prueba1(), prueba1.$columns);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
   AND,
   BDconnection,
   CURRENT_TIMESTAMP,
@@ -693,9 +1004,15 @@ export {
   QueryBuilder,
   Select,
   Update,
+  bool,
   defineTable,
   eq,
   generateTable,
   getConexion,
-  getRed
-};
+  getRed,
+  getTipoConexion,
+  int,
+  money,
+  timestamp,
+  varchar
+});

package/dist/{index.cjs → index.mjs}

@@ -1,69 +1,17 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __typeError = (msg) => {
   throw TypeError(msg);
 };
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
 var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
 var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
 
-// index.ts
-var index_exports = {};
-__export(index_exports, {
-  AND: () => AND,
-  BDconnection: () => BDconnection,
-  CURRENT_TIMESTAMP: () => CURRENT_TIMESTAMP,
-  DB: () => DB,
-  DeleteR: () => DeleteR,
-  ILIKE: () => ILIKE,
-  MAYOR: () => MAYOR,
-  MENOR: () => MENOR,
-  NOTNULL: () => NOTNULL,
-  NOW: () => NOW,
-  NULL: () => NULL,
-  OR: () => OR,
-  ORQ: () => ORQ,
-  QueryBuilder: () => QueryBuilder,
-  Select: () => Select,
-  Update: () => Update,
-  defineTable: () => defineTable,
-  eq: () => eq,
-  generateTable: () => generateTable,
-  getConexion: () => getConexion,
-  getRed: () => getRed
-});
-module.exports = __toCommonJS(index_exports);
-
 // conection/db.ts
 var conexionZORMZ3691;
 var tipoConexionZORMZ3691;
+function getTipoConexion() {
+  return tipoConexionZORMZ3691;
+}
 var BDconnection = class {
   constructor(bd, datos) {
     this.tipo = "pg";
@@ -199,29 +147,6 @@ function defineTable(tableName, columns) {
   });
   return proxy;
 }
-function ValidacionTypos(columna, id, maxLength) {
-  let sql = "";
-  if (columna === "varchar")
-    sql += `VARCHAR(${maxLength ? maxLength : "100"})`;
-  if (columna === "int") {
-    if (tipoConexionZORMZ3691 === "pg") {
-      sql += id ? " " : " INTEGER ";
-    } else {
-      sql += " INT ";
-    }
-  }
-  if (columna === "bool")
-    sql += tipoConexionZORMZ3691 === "mysql" ? " TINYINT(1) " : " BOOLEAN ";
-  if (columna === "double")
-    sql += tipoConexionZORMZ3691 === "mysql" ? " DOUBLE " : " DOUBLE PRECISION ";
-  if (columna === "timestamp")
-    sql += tipoConexionZORMZ3691 === "mysql" ? " TIMESTAMP " : " TIMESTAMPTZ ";
-  if (columna === "float")
-    sql += tipoConexionZORMZ3691 === "mysql" ? " FLOAT " : " REAL";
-  if (columna === "money")
-    sql += tipoConexionZORMZ3691 === "mysql" ? " DECIMAL(10,2) " : " NUMERIC(10,2)";
-  return sql;
-}
 async function generateTable(tabla, columns) {
   let queries = "";
   let columnDefs = [];
@@ -233,17 +158,15 @@ async function generateTable(tabla, columns) {
     if (!col.typo) {
       throw new Error(`La columna ${columnName} no tiene el tipo definido`);
     }
-    sql += ValidacionTypos(col.typo, col.id, col.maxLength);
-    if (col.id) {
-      if (id) throw new Error(`El id no puede repetirse en 2 campos de la tabla '${tabla}'`);
-      sql += tipoConexionZORMZ3691 === "mysql" ? " NOT NULL AUTO_INCREMENT " : " SERIAL ";
-      sql += " PRIMARY KEY ";
-      id = true;
-      columnDefs.push(sql);
-      continue;
-    }
-    sql += col.unique === void 0 ? " NOT NULL " : " UNIQUE";
-    sql += col.default === void 0 ? col.unique === void 0 ? " " : " NOT NULL " : ` DEFAULT ${typeof col.default === "string" ? tipoConexionZORMZ3691 === "mysql" ? `"${col.default}"` : `'${col.default}'` : col.default}`;
+    if (col.typo === "int") {
+      let valorSql = col.sqlz.replace("$ZORMZ", columnName);
+      col.sqlz = valorSql;
+    }
+    if (id && col.pk === true) {
+      throw new Error("El id es unico por fila");
+    }
+    id = col.pk === true ? true : false;
+    sql += col.sqlz;
     columnDefs.push(sql);
   }
   queries += `CREATE TABLE IF NOT EXISTS ${tabla} ( 
@@ -267,6 +190,185 @@ async function generateTable(tabla, columns) {
   }
 }
 
+// conection/controls/int.ts
+var IntColumn = class {
+  constructor() {
+    this.requerido = false;
+    this.unique = false;
+    this.autoIncrement = false;
+    this.unsingned = { uso: false, valor: 0 };
+  }
+  Required() {
+    this.requerido = true;
+    return this;
+  }
+  Pk() {
+    this.autoIncrement = true;
+    this.pk = true;
+    return this;
+  }
+  Unique() {
+    this.unique = true;
+    return this;
+  }
+  Unsingned(numeroPositivosInicio = 0) {
+    if (numeroPositivosInicio != void 0 && numeroPositivosInicio < 0) {
+      throw new Error(" Unsingned() solo permite numeros positivos ");
+    }
+    this.unsingned.uso = true;
+    this.unsingned.valor = numeroPositivosInicio;
+  }
+  AutoIncrement() {
+    this.autoIncrement = true;
+    this.requerido = true;
+    return this;
+  }
+  Default(value) {
+    this.defaultData = value;
+    return this;
+  }
+  withType({ defaultData, id = false, requerido, unique, autoIncrement }) {
+    if (defaultData !== void 0) this.Default(defaultData);
+    if (requerido) this.Required();
+    if (unique) this.Unique();
+    if (autoIncrement) this.AutoIncrement();
+    return this;
+  }
+  $() {
+    const parts = [];
+    const db = getTipoConexion();
+    parts.push(db === "mysql" ? "INT" : "INTEGER");
+    if (this.unsingned.uso) {
+      parts.push(
+        db === "mysql" ? "UNSIGNED" : ` CHECK ( $ZORMZ >= ${this.unsingned.valor}) `
+      );
+    }
+    parts.push(
+      this.requerido ? "NOT NULL" : db === "pg" && this.pk ? " " : "NULL"
+    );
+    if (this.autoIncrement) {
+      parts.push(
+        db === "pg" ? "GENERATED ALWAYS AS IDENTITY" : "AUTO_INCREMENT"
+      );
+    }
+    if (this.pk) {
+      parts.push("PRIMARY KEY");
+      const valor2 = {
+        pk: true,
+        typo: "int",
+        sqlz: parts.join(" ")
+      };
+      return valor2;
+    }
+    if (this.defaultData !== void 0 && !this.autoIncrement) {
+      parts.push(`DEFAULT ${this.defaultData}`);
+    }
+    if (this.unique) parts.push("UNIQUE");
+    const valor = {
+      pk: false,
+      typo: "int",
+      sqlz: parts.join(" ")
+    };
+    return valor;
+  }
+};
+function int() {
+  return new IntColumn();
+}
+
+// conection/controls/timestamp.ts
+var Timestamp = class {
+  constructor() {
+    this.requerido = false;
+    this.defaultNow = false;
+    this.onUpdateNow = false;
+  }
+  required() {
+    this.requerido = true;
+    return this;
+  }
+  now() {
+    this.defaultNow = true;
+    return this;
+  }
+  onUpdate() {
+    this.onUpdateNow = true;
+    return this;
+  }
+  $() {
+    const parts = [];
+    const db = getTipoConexion();
+    parts.push(db === "mysql" ? "TIMESTAMP" : "TIMESTAMPTZ");
+    parts.push(this.requerido ? "NOT NULL" : "NULL");
+    if (this.defaultNow) {
+      parts.push(`DEFAULT ${db === "mysql" ? "CURRENT_TIMESTAMP" : "NOW()"}`);
+    }
+    if (this.onUpdateNow && db === "mysql") {
+      parts.push("ON UPDATE CURRENT_TIMESTAMP");
+    }
+    const response = {
+      typo: "timestamp",
+      pk: false,
+      sqlz: parts.join(" ")
+    };
+    return response;
+  }
+};
+function timestamp() {
+  return new Timestamp();
+}
+
+// conection/controls/varchar.ts
+var Varchar = class {
+  constructor(cantidad = 100) {
+    this.maxLenth = 100;
+    this.defaultData = "";
+    this.requerido = false;
+    this.unique = false;
+    this.maxLenth = cantidad;
+  }
+  withType({
+    maxLenth = 100,
+    defaultData = "",
+    requerido = false,
+    unique = false
+  }) {
+    this.maxLenth = maxLenth;
+    this.requerido = requerido;
+    this.unique = unique;
+    return this.Default(defaultData).$();
+  }
+  Required() {
+    this.requerido = true;
+    return this;
+  }
+  Unique() {
+    this.unique = true;
+    return this;
+  }
+  Default(textoDefecto) {
+    let opcion = getTipoConexion();
+    if (opcion === "mysql") {
+      this.defaultData = ` "${textoDefecto}" `;
+    } else if (opcion === "pg") {
+      this.defaultData = ` '${textoDefecto}' `;
+    }
+    return this;
+  }
+  $() {
+    let sqlz = `VARCHAR(${this.maxLenth}) ${this.requerido ? "NOT NULL" : "NULL"} ${this.defaultData.length > 0 ? ` DEFAULT ${this.defaultData} ` : " "} ${this.unique ? " UNIQUE" : " "} `;
+    const response = {
+      typo: "varchar",
+      pk: false,
+      sqlz
+    };
+    return response;
+  }
+};
+function varchar(cantidad = 100) {
+  return new Varchar(cantidad);
+}
+
 // conection/middleware/delete.ts
 var _condicion, _tabla;
 var DeleteR = class {
@@ -276,12 +378,12 @@ var DeleteR = class {
    * @example
    * delete from tabla
    */
-  constructor(conexion, tabla) {
+  constructor(conexion2, tabla) {
     __privateAdd(this, _condicion);
     __privateAdd(this, _tabla);
     __privateSet(this, _tabla, tabla);
     __privateSet(this, _condicion, "");
-    this.conexion = conexion;
+    this.conexion = conexion2;
   }
   /**
    *
@@ -327,7 +429,7 @@ var QueryBuilder = class {
    * @param {string} tabla - nombre de la ta tabla - campo obligatorio
    * @param {string[]} values - campo obligatorio
    */
-  constructor(conexion, tabla, parametros) {
+  constructor(conexion2, tabla, parametros) {
     if (!parametros || !Array.isArray(parametros)) {
       throw new Error(`campos obligatorios`);
     }
@@ -338,7 +440,7 @@ var QueryBuilder = class {
     this.parametros = parametros;
     this.valores = [];
     this.valorRetorno = null;
-    this.conexion = conexion;
+    this.conexion = conexion2;
   }
   /**
    *
@@ -438,8 +540,8 @@ var Select = class {
    * @param {string[]} values - campo obligatorio
    * @param {string} condition - tabla1.id = tabla2.idtabla1 - id='2' - id='2' AND id='3'
    */
-  constructor(conexion, parametros = "*") {
-    this.conexion = conexion;
+  constructor(conexion2, parametros = "*") {
+    this.conexion = conexion2;
     this.valores = !Array.isArray(parametros) ? false : true;
     this.parametros = parametros;
     this.tabla = void 0;
@@ -623,7 +725,7 @@ var Update = class {
   /**
    * @param {string} nombreTabla - nombre de la tabla a actualizar
    */
-  constructor(conexion, nombreTabla) {
+  constructor(conexion2, nombreTabla) {
     this.nombreTabla = "";
     this.valores = "";
     this.condicion = "";
@@ -634,7 +736,7 @@ var Update = class {
       throw new Error("El nombre de la tabla es requerido");
     }
     this.nombreTabla = nombreTabla;
-    this.conexion = conexion;
+    this.conexion = conexion2;
   }
   /**
    * @param {Valores} valores - valores a actualizar
@@ -731,8 +833,99 @@ var DB = class {
     return new DeleteR(conex, nombreTabla);
   }
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
+
+// conection/controls/bool.ts
+var BoolColumn = class {
+  constructor() {
+    this.requerido = false;
+  }
+  required() {
+    this.requerido = true;
+    return this;
+  }
+  default(value) {
+    this.defaultData = value;
+    return this;
+  }
+  $() {
+    const parts = [];
+    const db = getTipoConexion();
+    parts.push("BOOLEAN");
+    parts.push(this.requerido ? "NOT NULL" : "NULL");
+    if (this.defaultData !== void 0) {
+      parts.push(
+        `DEFAULT ${db === "mysql" ? this.defaultData ? 1 : 0 : this.defaultData}`
+      );
+    }
+    const response = {
+      typo: "bool",
+      pk: false,
+      sqlz: parts.join(" ")
+    };
+    return response;
+  }
+};
+function bool() {
+  return new BoolColumn();
+}
+
+// conection/controls/money.ts
+var Money = class {
+  constructor(presicion = 10, decimales = 2) {
+    this.precision = 10;
+    this.scale = 2;
+    this.requerido = false;
+    this.precision = presicion;
+    this.scale = decimales;
+  }
+  required() {
+    this.requerido = true;
+    return this;
+  }
+  default(value) {
+    this.defaultData = value;
+    return this;
+  }
+  $() {
+    const parts = [];
+    const db = getTipoConexion();
+    parts.push(
+      db === "mysql" ? `DECIMAL(${this.precision},${this.scale})` : `NUMERIC(${this.precision},${this.scale})`
+    );
+    parts.push(this.requerido ? "NOT NULL" : "NULL");
+    if (this.defaultData !== void 0) {
+      parts.push(`DEFAULT ${this.defaultData.toFixed(this.scale)}`);
+    }
+    const response = {
+      typo: "money",
+      pk: false,
+      sqlz: parts.join(" ")
+    };
+    return response;
+  }
+};
+function money(presicion = 10, decimales = 2) {
+  return new Money(presicion, decimales);
+}
+
+// index.ts
+var conexion = {
+  database: "pruebamaster",
+  host: "localhost",
+  password: "zainmaster123",
+  port: 5432,
+  user: "postgres"
+};
+getConexion("pg", conexion);
+var prueba1 = defineTable("prueba1", {
+  id: int().Pk().$(),
+  valor: varchar(200).Default("hola").$(),
+  resultado: int().Default(0).$(),
+  fechaRegistro: timestamp().required().now().$(),
+  fechaUpdate: timestamp().required().now().onUpdate().$()
+});
+generateTable(prueba1(), prueba1.$columns);
+export {
   AND,
   BDconnection,
   CURRENT_TIMESTAMP,
@@ -749,9 +942,15 @@ var DB = class {
   QueryBuilder,
   Select,
   Update,
+  bool,
   defineTable,
   eq,
   generateTable,
   getConexion,
-  getRed
-});
+  getRed,
+  getTipoConexion,
+  int,
+  money,
+  timestamp,
+  varchar
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "zormz",
-    "version": "1.2.4",
+    "version": "1.2.5",
     "description": "",
     "author": "",
     "license": "ISC",