zormz 1.1.0 → 1.1.2

package/dist/index.cjs

@@ -42,19 +42,20 @@ __export(index_exports, {
   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,
   getConexion: () => getConexion,
-  getRed: () => getRed,
-  mayor: () => mayor,
-  menor: () => menor,
-  now: () => now
+  getRed: () => getRed
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -161,6 +162,23 @@ function getConexion(bd, datos) {
 function getRed() {
   return conexion1;
 }
+function defineTable(tableName, columns) {
+  const fn = () => tableName;
+  const proxy = new Proxy(fn, {
+    get(_target, prop) {
+      if (prop === "name") return tableName;
+      if (prop === "toString") return () => tableName;
+      if (prop === "valueOf") return () => tableName;
+      const col = columns[prop];
+      if (col !== void 0) return `${tableName}.${col}`;
+      return fn[prop];
+    },
+    apply() {
+      return tableName;
+    }
+  });
+  return proxy;
+}
 
 // conection/middleware/delete.ts
 var _condicion, _tabla;
@@ -403,11 +421,11 @@ var Select = class {
 
 // conection/middleware/condicionals.ts
 var AND = (...valor1) => {
-  const separacion = valor1.join(" and ");
+  const separacion = valor1.filter((dato) => dato !== void 0 && dato !== null).join(" and ");
   return `(${separacion})`;
 };
 var OR = (...valor1) => {
-  const separadosComas = valor1.join(" or ");
+  const separadosComas = valor1.filter((dato) => dato !== void 0 && dato !== null).join(" or ");
   return `(${separadosComas})`;
 };
 var ORQ = (condicion1, ...condicionals) => {
@@ -419,9 +437,9 @@ var ORQ = (condicion1, ...condicionals) => {
   return separador;
 };
 var ILIKE = (valor1, valor2) => {
-  return `${valor1} ILIKE '%${valor2}%'`;
+  return `${valor1} ILIKE '${valor2}'`;
 };
-var now = (variable, diasTrancurridos, minor = true) => {
+var NOW = (variable, diasTrancurridos, minor = true) => {
   if (typeof variable !== "string") {
     throw new Error("Variable no valida");
   }
@@ -447,10 +465,10 @@ var eq = (valor1, valor2, literal = true) => {
   }
   return `${valor1} = '${valor2}'`;
 };
-var mayor = (valor, valor2) => {
+var MAYOR = (valor, valor2) => {
   return ` ${valor} > ${valor2} `;
 };
-var menor = (valor, valor2) => {
+var MENOR = (valor, valor2) => {
   return ` ${valor} < ${valor2} `;
 };
 
@@ -575,17 +593,18 @@ var DB = class {
   DB,
   DeleteR,
   ILIKE,
+  MAYOR,
+  MENOR,
   NOTNULL,
+  NOW,
   NULL,
   OR,
   ORQ,
   QueryBuilder,
   Select,
   Update,
+  defineTable,
   eq,
   getConexion,
-  getRed,
-  mayor,
-  menor,
-  now
+  getRed
 });

package/dist/index.d.cts

@@ -31,6 +31,22 @@ declare class BDconnection {
  */
 declare function getConexion(bd: connectionDB, datos: connecionLocal | connecionRed): void;
 declare function getRed(): BDconnection;
+type ColumnsMap = Record<string, string>;
+/**
+ *
+ * @param {string} tableName
+ * @param {string} columns
+ * @example
+ * export const productosPrueba = defineTable("productosPrueba",{
+ * id:"id",
+ * nombre:"nombre",
+ * descripcion:"descripcion"
+ * });
+ * @returns
+ */
+declare function defineTable<T extends ColumnsMap>(tableName: string, columns: T): T & (() => string) & {
+    name: string;
+};
 
 declare class DeleteR {
     #private;
@@ -229,13 +245,23 @@ declare const OR: (...valor1: Valor[]) => string;
  * @returns
  */
 declare const ORQ: (condicion1: Valor, ...condicionals: Valor[]) => string;
+/**
+ *
+ * @param {string} valor1
+ * @param {string} valor2
+ * @example
+ * SELECT().WHERE(ILIKE(t_productos.nombre, `%${contenido}`))
+ * SELECT().WHERE(ILIKE(t_productos.nombre, `${contenido}%`))
+ * SELECT().WHERE(ILIKE(t_productos.nombre, `%${contenido}%`))
+ * @returns
+ */
 declare const ILIKE: (valor1: string, valor2: string) => string;
 /**
  *
  * @param {String} variable -Type timestamp
  * @param {Number} diasTrancurridos -type number
  */
-declare const now: (variable: string, diasTrancurridos: number, minor?: boolean) => string;
+declare const NOW: (variable: string, diasTrancurridos: number, minor?: boolean) => string;
 /**
  *
  * @param {String} variable - variable
@@ -260,7 +286,23 @@ declare const NOTNULL: (variable: string) => string;
  * eq('id',valor1, false)
  */
 declare const eq: (valor1: Valor, valor2: Valor, literal?: boolean) => string;
-declare const mayor: (valor: string, valor2: string) => string;
-declare const menor: (valor: string, valor2: string) => string;
+/**
+ *
+ * @param {string} valor
+ * @param {string} valor2
+ * @example
+ * MAYOR(t_productos.id, `${maxPageSize * 2}`),
+ * @returns
+ */
+declare const MAYOR: (valor: string, valor2: string) => string;
+/**
+ *
+ * @param {string} valor
+ * @param {string} valor2
+ * @example
+ * MENOR(t_productos.id, `${maxPageSize * 2}`),
+ * @returns
+ */
+declare const MENOR: (valor: string, valor2: string) => string;
 
-export { AND, BDconnection, type Consultas, DB, DeleteR, ILIKE, NOTNULL, NULL, OR, ORQ, QueryBuilder, Select, type Tipos, Update, type Valores, type arrayData, type arrayDatas, type connecionLocal, type connecionRed, type connectionDB, eq, getConexion, getRed, mayor, menor, now, type valor };
+export { AND, BDconnection, type Consultas, DB, DeleteR, ILIKE, MAYOR, MENOR, NOTNULL, NOW, NULL, OR, ORQ, QueryBuilder, Select, type Tipos, Update, type Valores, type arrayData, type arrayDatas, type connecionLocal, type connecionRed, type connectionDB, defineTable, eq, getConexion, getRed, type valor };

package/dist/index.d.ts

@@ -31,6 +31,22 @@ declare class BDconnection {
  */
 declare function getConexion(bd: connectionDB, datos: connecionLocal | connecionRed): void;
 declare function getRed(): BDconnection;
+type ColumnsMap = Record<string, string>;
+/**
+ *
+ * @param {string} tableName
+ * @param {string} columns
+ * @example
+ * export const productosPrueba = defineTable("productosPrueba",{
+ * id:"id",
+ * nombre:"nombre",
+ * descripcion:"descripcion"
+ * });
+ * @returns
+ */
+declare function defineTable<T extends ColumnsMap>(tableName: string, columns: T): T & (() => string) & {
+    name: string;
+};
 
 declare class DeleteR {
     #private;
@@ -229,13 +245,23 @@ declare const OR: (...valor1: Valor[]) => string;
  * @returns
  */
 declare const ORQ: (condicion1: Valor, ...condicionals: Valor[]) => string;
+/**
+ *
+ * @param {string} valor1
+ * @param {string} valor2
+ * @example
+ * SELECT().WHERE(ILIKE(t_productos.nombre, `%${contenido}`))
+ * SELECT().WHERE(ILIKE(t_productos.nombre, `${contenido}%`))
+ * SELECT().WHERE(ILIKE(t_productos.nombre, `%${contenido}%`))
+ * @returns
+ */
 declare const ILIKE: (valor1: string, valor2: string) => string;
 /**
  *
  * @param {String} variable -Type timestamp
  * @param {Number} diasTrancurridos -type number
  */
-declare const now: (variable: string, diasTrancurridos: number, minor?: boolean) => string;
+declare const NOW: (variable: string, diasTrancurridos: number, minor?: boolean) => string;
 /**
  *
  * @param {String} variable - variable
@@ -260,7 +286,23 @@ declare const NOTNULL: (variable: string) => string;
  * eq('id',valor1, false)
  */
 declare const eq: (valor1: Valor, valor2: Valor, literal?: boolean) => string;
-declare const mayor: (valor: string, valor2: string) => string;
-declare const menor: (valor: string, valor2: string) => string;
+/**
+ *
+ * @param {string} valor
+ * @param {string} valor2
+ * @example
+ * MAYOR(t_productos.id, `${maxPageSize * 2}`),
+ * @returns
+ */
+declare const MAYOR: (valor: string, valor2: string) => string;
+/**
+ *
+ * @param {string} valor
+ * @param {string} valor2
+ * @example
+ * MENOR(t_productos.id, `${maxPageSize * 2}`),
+ * @returns
+ */
+declare const MENOR: (valor: string, valor2: string) => string;
 
-export { AND, BDconnection, type Consultas, DB, DeleteR, ILIKE, NOTNULL, NULL, OR, ORQ, QueryBuilder, Select, type Tipos, Update, type Valores, type arrayData, type arrayDatas, type connecionLocal, type connecionRed, type connectionDB, eq, getConexion, getRed, mayor, menor, now, type valor };
+export { AND, BDconnection, type Consultas, DB, DeleteR, ILIKE, MAYOR, MENOR, NOTNULL, NOW, NULL, OR, ORQ, QueryBuilder, Select, type Tipos, Update, type Valores, type arrayData, type arrayDatas, type connecionLocal, type connecionRed, type connectionDB, defineTable, eq, getConexion, getRed, type valor };

package/dist/index.js

@@ -109,6 +109,23 @@ function getConexion(bd, datos) {
 function getRed() {
   return conexion1;
 }
+function defineTable(tableName, columns) {
+  const fn = () => tableName;
+  const proxy = new Proxy(fn, {
+    get(_target, prop) {
+      if (prop === "name") return tableName;
+      if (prop === "toString") return () => tableName;
+      if (prop === "valueOf") return () => tableName;
+      const col = columns[prop];
+      if (col !== void 0) return `${tableName}.${col}`;
+      return fn[prop];
+    },
+    apply() {
+      return tableName;
+    }
+  });
+  return proxy;
+}
 
 // conection/middleware/delete.ts
 var _condicion, _tabla;
@@ -351,11 +368,11 @@ var Select = class {
 
 // conection/middleware/condicionals.ts
 var AND = (...valor1) => {
-  const separacion = valor1.join(" and ");
+  const separacion = valor1.filter((dato) => dato !== void 0 && dato !== null).join(" and ");
   return `(${separacion})`;
 };
 var OR = (...valor1) => {
-  const separadosComas = valor1.join(" or ");
+  const separadosComas = valor1.filter((dato) => dato !== void 0 && dato !== null).join(" or ");
   return `(${separadosComas})`;
 };
 var ORQ = (condicion1, ...condicionals) => {
@@ -367,9 +384,9 @@ var ORQ = (condicion1, ...condicionals) => {
   return separador;
 };
 var ILIKE = (valor1, valor2) => {
-  return `${valor1} ILIKE '%${valor2}%'`;
+  return `${valor1} ILIKE '${valor2}'`;
 };
-var now = (variable, diasTrancurridos, minor = true) => {
+var NOW = (variable, diasTrancurridos, minor = true) => {
   if (typeof variable !== "string") {
     throw new Error("Variable no valida");
   }
@@ -395,10 +412,10 @@ var eq = (valor1, valor2, literal = true) => {
   }
   return `${valor1} = '${valor2}'`;
 };
-var mayor = (valor, valor2) => {
+var MAYOR = (valor, valor2) => {
   return ` ${valor} > ${valor2} `;
 };
-var menor = (valor, valor2) => {
+var MENOR = (valor, valor2) => {
   return ` ${valor} < ${valor2} `;
 };
 
@@ -522,17 +539,18 @@ export {
   DB,
   DeleteR,
   ILIKE,
+  MAYOR,
+  MENOR,
   NOTNULL,
+  NOW,
   NULL,
   OR,
   ORQ,
   QueryBuilder,
   Select,
   Update,
+  defineTable,
   eq,
   getConexion,
-  getRed,
-  mayor,
-  menor,
-  now
+  getRed
 };

package/package.json

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