dbtabla 0.8.7 → 2.0.0

package/.eslintrc.js

@@ -1,30 +1,30 @@
-module.exports = {
-    "env": {
-        "browser": true,
-        "es6": true,
-        "node": true
-    },
-    "extends": "eslint:recommended",
-    "parserOptions": {
-        "ecmaVersion": 2018,
-        "sourceType": "module"
-    },
-    "rules": {
-        "indent": [
-            "error",
-            4
-        ],
-        "linebreak-style": [
-            "error",
-            "windows"
-        ],
-        "quotes": [
-            "error",
-            "double"
-        ],
-        "semi": [
-            "error",
-            "never"
-        ]
-    }
-};
+module.exports = {
+    "env": {
+        "browser": true,
+        "es6": true,
+        "node": true
+    },
+    "extends": "eslint:recommended",
+    "parserOptions": {
+        "ecmaVersion": 2018,
+        "sourceType": "module"
+    },
+    "rules": {
+        "indent": [
+            "error",
+            4
+        ],
+        "linebreak-style": [
+            "error",
+            "windows"
+        ],
+        "quotes": [
+            "error",
+            "double"
+        ],
+        "semi": [
+            "error",
+            "never"
+        ]
+    }
+};

package/eslint.config.js

@@ -0,0 +1,22 @@
+const js = require("@eslint/js");
+const globals = require("globals");
+
+module.exports = [
+    js.configs.recommended,
+    {
+        languageOptions: {
+            ecmaVersion: 2024,
+            sourceType: "module",
+            globals: {
+                ...globals.node,
+                ...globals.browser
+            }
+        },
+        rules: {
+            "indent": ["error", 4],
+            "linebreak-style": ["error", "windows"],
+            "quotes": ["error", "double"],
+            "semi": ["error", "never"]
+        }
+    }
+];

package/lib/Connect.js

@@ -2,12 +2,22 @@ const fs=require("fs")
 const path=require("path")
 const dbTablaModel=require("tabla-model")
 const dbTabla=require(__dirname+"/dbTabla.js")
+const procesingSql = require('./procesingSql')
 /**
 * Connect
 * clase abstracta para crear la clase de conexion a la base de datos
 */
-class Connect
-{
+class Connect {
+    #escapeChar;
+    #reserveIdentifiers;
+    #ar_aliased_tables;
+    #dbprefix;
+    #swap_pre;
+    #information_schema;
+    #models;
+    #caheTablas;
+    #createdTables;
+    #escapeString;
     /**
     * constructor de la clase
     * @param {object} params - parametros de conexion
@@ -15,15 +25,15 @@ class Connect
     constructor(params,typeDB="")
     {
         this.config=params
-        this.__escapeChar=""
-        this.__reserveIdentifiers=["*"]
-        this.__ar_aliased_tables=[]
-        this.__dbprefix=""
-        this.__swap_pre=""
-        this.__information_schema = " "
-        this.__models={}
+        this.#escapeChar=""
+        this.#reserveIdentifiers=["*"]
+        this.#ar_aliased_tables=[]
+        this.#dbprefix=""
+        this.#swap_pre=""
+        this.#information_schema = " "
+        this.#models={}
         this.typeDB=typeDB
-        this.__caheTablas={}
+        this.#caheTablas={}
     }
     /**
     * retorna la configuracion para los helpers
@@ -32,13 +42,13 @@ class Connect
     helpersConf()
     {
         return {
-            escapeChar:this.__escapeChar,
-            reserveIdentifiers:this.__reserveIdentifiers,
-            ar_aliased_tables:this.__ar_aliased_tables,
-            dbprefix:this.__dbprefix,
-            swap_pre:this.__swap_pre,
+            escapeChar:this.#escapeChar,
+            reserveIdentifiers:this.#reserveIdentifiers,
+            ar_aliased_tables:this.#ar_aliased_tables,
+            dbprefix:this.#dbprefix,
+            swap_pre:this.#swap_pre,
             typeDB:this.typeDB,
-            escapeString:typeof this.__escapeString==="function"?e=>this.__escapeString(e):null
+            escapeString:typeof this.#escapeString==="function"?e=>this.#escapeString(e):null
         }
     }
     /**
@@ -49,7 +59,7 @@ class Connect
     model(tabla)
     {
 
-        return this.__models[tabla] instanceof dbTablaModel?this.__models[tabla]:false
+        return this.#models[tabla] instanceof dbTablaModel?this.#models[tabla]:false
     }
     /**
     * agrega un modelo a la lista de modelos interna
@@ -59,11 +69,11 @@ class Connect
     {
         if(model instanceof dbTablaModel)
         {
-            this.__models[model.tabla]=model
+            this.#models[model.tabla]=model
         }else if(typeof model==="object" && model!==null){
-            this.__models[model.tabla]= new dbTablaModel(model.tabla,model)
+            this.#models[model.tabla]= new dbTablaModel(model.tabla,model)
         }else {
-            this.__models[model.tabla]= new dbTablaModel(model,this.helpersConf().escapeChar)
+            this.#models[model.tabla]= new dbTablaModel(model,this.helpersConf().escapeChar)
         }
 
     }
@@ -113,12 +123,12 @@ class Connect
     */
     tabla(tabla,callback,verify=false)
     {
-        if(typeof this.__caheTablas[tabla]!=="undefined")
+        if(typeof this.#caheTablas[tabla]!=="undefined")
         {
-            typeof callback==="function"?callback(this.__caheTablas[tabla]):null
-            return this.__caheTablas[tabla]
+            typeof callback==="function"?callback(this.#caheTablas[tabla]):null
+            return this.#caheTablas[tabla]
         }
-        return this.__caheTablas[tabla] = new dbTabla({
+        return this.#caheTablas[tabla] = new dbTabla({
             tabla:tabla,
             connection:this,
             callback:callback,
@@ -149,7 +159,7 @@ class Connect
     * @param {string} table - nombre de la tabla
     * @return {Promise}
     */
-    __keysInTable(table)
+    #keysInTable(table)
     {
         return new Promise((res)=>
         {
@@ -176,9 +186,11 @@ class Connect
                 rej()
             }else
             {
+                
                 if(create)
                 {
-                    this.__createTable(this.model(tabla))
+                
+                    this.#createTable(this.model(tabla))
                         .then(res).catch(rej)
                 }else
                 {
@@ -194,49 +206,54 @@ class Connect
     * @param {dbTablaModel} model - objeto del modelo
     * @return {Promise}
     */
-    __createTable(model)
+    #createTable(model)
     {
+       
         return new Promise((res,rej)=>
         {
-            this.__createdTables={}
+            this.#createdTables={}
             let rescursive=(foreingKey,i)=>
             {
+                
                 if(foreingKey[i]!==undefined)
                 {
                     try
                     {
                         this.tabla(foreingKey[i].reference,(t)=>
                         {
-                            if(this.__createdTables[foreingKey[i].reference])
-                                this.__initializeTable(t).then(()=>
-                                {
-                                    i++
-                                    rescursive(foreingKey,i)
-                                }).catch(rej)
+                            rescursive(foreingKey,++i) 
                         },true)
                     }catch(e){rej(e)}
                 }else {
+                    
                     this.query(model.sql(this)).then(()=>{
-                        this.__createdTables[model.tabla]=true
-                        res(model.getData())
+                        this.#createdTables[model.tabla]=true
+                        this.#initializeTable(model.tabla).then(()=>
+                            {
+                               
+                                res(model.getData())
+                            }).catch(rej)
                     }).catch(rej)
                 }
             }
             rescursive(model.foreingKey(),0)
         })
     }
-    __initializeTable(tab)
+    #initializeTable(tab)
     {
         return new Promise(async(res)=>
         {
-            let init=this.model(tab.tabla).getData().init
+            
+            let sql=new procesingSql(this.model(tab).getData(),this.helpersConf())
+            let init=this.model(tab).getData().init
+            
             if(init.length<1)
             {
                 return res()
             }
             for(let item of init)
             {
-                await tab.insert(item)
+                await this.query(sql.insert(item))
             }
             res()
 

package/lib/dbResult.js

@@ -20,9 +20,9 @@ class dbResult extends Array
         Object.defineProperty(this, "$sql", {
             configurable : true,
             enumerable   : false,
-            value        : dbTabla.__lastSql,
+            value        : dbTabla.lastSql,
         })
-        //this.sql=dbTabla.__lastSql
+        //this.sql=dbTabla.lastSql
     }
 }
 module.exports=dbResult

package/lib/dbTabla.js

@@ -5,23 +5,30 @@ const dbTablaError = require("./dbTablaError")
 * dbTabla
 * representacion de una tabla en la base de datos
 */
-class dbTabla
-{
+class dbTabla {
+    #connection;
+    #lastSql;
+    #keys;
+    #callbackKey;
+    #config;
+
+    get lastSql() { return this.#lastSql; }
+
     /**
     * @param {object} tabla, connection, callback,  config
     * @param {boolean} ret indica si verificara la existencia de la tabla o esperara la primera consulta
     */
     constructor({tabla,connection,callback,config},ret=false)
     {
-        this.__connection=connection
-        this.__lastSql=""
-        this.__keys=false
+        this.#connection=connection
+        this.#lastSql=""
+        this.#keys=false
         this.tabla=tabla || null
-        this.__callbackKey=callback ||( e=>e)
-        this.__config=config || {}
+        this.#callbackKey=callback ||( e=>e)
+        this.#config=config || {}
         this.typeDB=connection.typeDB
         if(ret)
-            this.__verifyKeys()
+            this.#verifyKeys()
     }
     /**
     * agrega la propiedad $sql que continen
@@ -29,13 +36,13 @@ class dbTabla
     * @param {object}
     * @return {object}
     */
-    __PropertyOk(ok)
+    #PropertyOk(ok)
     {
         if(typeof ok ==="object")
         Object.defineProperty(ok, "$sql", {
             configurable : true,
             enumerable   : false,
-            value        : this.__lastSql,
+            value        : this.#lastSql,
         })
         return ok
     }
@@ -43,28 +50,28 @@ class dbTabla
     * verifica la existencia de la tabla y obtiene los metadatos
     * @param {function} call
     */
-    __verifyKeys(call=e=>e)
+    #verifyKeys(call=e=>e)
     {
-        if(!this.__keys)
+        if(!this.#keys)
         {
-            this.__connection.__keysInTable(this.tabla)
+            this.#connection.__keysInTable(this.tabla)
                 .then(keys=>
                 {
                     this.colum=keys.colum
-                    this.sql=new procesingSql(keys, this.__config)
-                    this.__keys=true
+                    this.sql=new procesingSql(keys, this.#config)
+                    this.#keys=true
                     if(keys.methods)
                         for(let i in keys.methods)
                         {
-                            this[i]=(...params)=>keys.methods[i](this,this.__connection,...params)
+                            this[i]=(...params)=>keys.methods[i](this,this.#connection,...params)
                         }
 
-                    this.__callbackKey(this)
+                    this.#callbackKey(this)
                     call()
                 }).catch(e=>{
 
 
-                    this.__callbackKey(null,e)
+                    this.#callbackKey(null,e)
                     call(e)
 
 
@@ -79,7 +86,7 @@ class dbTabla
     * @param {array|object} resultado obtenido de la consulta ejecutada
     * @return {dbResult}
     */
-    __formatResult(result)
+    #formatResult(result)
     {
         return new dbResult(this,result)
     }
@@ -99,7 +106,7 @@ class dbTabla
         return new Promise((resolve,reject)=>
         {
 
-            this.__verifyKeys(e=>
+            this.#verifyKeys(e=>
             {
                 if(e)
                 {
@@ -107,14 +114,14 @@ class dbTabla
                 }
                 if(params instanceof Array && params.length==1)
                 {
-                    this.__lastSql=this.sql.insert(params[0])
+                    this.#lastSql=this.sql.insert(params[0])
                 }else {
-                    this.__lastSql=this.sql.insert(params)
+                    this.#lastSql=this.sql.insert(params)
                 }
 
-                this.__connection.query(this.__lastSql).then(d=>{
+                this.#connection.query(this.#lastSql).then(d=>{
 
-                    resolve(this.__PropertyOk(d))
+                    resolve(this.#PropertyOk(d))
                 }).catch(e=>reject(e))
             })
         })
@@ -151,15 +158,15 @@ class dbTabla
     {
         return new Promise((resolve,reject)=>
         {
-            this.__verifyKeys(e=>
+            this.#verifyKeys(e=>
             {
                 if(e)
                 {
                     return reject(e)
                 }
-                this.__lastSql = this.sql.select(...params)
-                this.__connection.query(this.__lastSql).then(d=>{
-                    resolve(this.__formatResult(d))
+                this.#lastSql = this.sql.select(...params)
+                this.#connection.query(this.#lastSql).then(d=>{
+                    resolve(this.#formatResult(d))
                 }).catch(e=>reject(e))
             })
 
@@ -271,11 +278,11 @@ class dbTabla
     {
         return new Promise((resolve,reject)=>
         {
-            this.__verifyKeys(()=>
+            this.#verifyKeys(()=>
             {
-                this.__lastSql = this.sql.busqueda(cadena,campo_bus,campos,where,joins,group,having,order,limit)
-                this.__connection.query(this.__lastSql).then(d=>{
-                    resolve(this.__formatResult(d))
+                this.#lastSql = this.sql.busqueda(cadena,campo_bus,campos,where,joins,group,having,order,limit)
+                this.#connection.query(this.#lastSql).then(d=>{
+                    resolve(this.#formatResult(d))
                 }).catch(e=>reject(e))
             })
 
@@ -324,18 +331,18 @@ class dbTabla
         }
         return new Promise((resolve,reject)=>
         {
-            this.__verifyKeys(e=>
+            this.#verifyKeys(e=>
             {
                 if(e)
                 {
                     return reject(e)
                 }
-                this.__lastSql =this.sql.update(sets,where,reject)
-                if(  this.__lastSql)
+                this.#lastSql =this.sql.update(sets,where,reject)
+                if(  this.#lastSql)
                 {
-                    this.__connection.query(this.__lastSql).then(d=>{
+                    this.#connection.query(this.#lastSql).then(d=>{
 
-                        resolve(this.__PropertyOk(d))
+                        resolve(this.#PropertyOk(d))
                     }).catch(e=>reject(e))
                 }
             })
@@ -377,16 +384,16 @@ class dbTabla
         }
         return new Promise((resolve,reject)=>
         {
-            this.__verifyKeys(e=>
+            this.#verifyKeys(e=>
             {
                 if(e)
                 {
                     return reject(e)
                 }
-                this.__lastSql =this.sql.delete(where)
-                this.__connection.query(this.__lastSql).then(d=>{
+                this.#lastSql =this.sql.delete(where)
+                this.#connection.query(this.#lastSql).then(d=>{
 
-                    resolve(this.__PropertyOk(d))
+                    resolve(this.#PropertyOk(d))
                 }).catch(e=>reject(e))
             })
         })

package/lib/procesingSql.js

@@ -4,8 +4,8 @@ const SQLITE3_DB=require("./const").SQLITE3_DB
 * prosesingSql
 * crea consultas sql insert, select, update, delete validas para una tabla
 */
-class prosesingSql
-{
+class prosesingSql {
+    #helpers;
     /**
     *
     * @param {object} colum, prymary, autoincrement, OrderColum, TypeDB - metadadtos de la tabla
@@ -14,7 +14,7 @@ class prosesingSql
     constructor(keys,config)
     {
         this.tabla=keys.tabla
-        this.__helpers=new dbHelpers(config)
+        this.#helpers=new dbHelpers(config)
         this.colums=keys.colums
         this.primary=this.colums.filter(p=>p.primary)
         let auto=this.colums.find(p=>p.autoincrement)
@@ -116,26 +116,26 @@ class prosesingSql
         {
             campo_bus=this.OrderColum
         }
-        let search=this.__campoBusqueda(this.__helpers.filterSqlI(cadena),campo_bus)
-        let params=this.__resolveParamsSelect(campos,joins,where,group,having,order,limit)
+        let search=this.#campoBusqueda(this.#helpers.filterSqlI(cadena),campo_bus)
+        let params=this.#resolveParamsSelect(campos,joins,where,group,having,order,limit)
         let arrSql=[],
-            arrJoin=this.__join(params.joins),
-            w=this.__booleanSql("WHERE",params.where),
-            g=this.__groupBy(params.group),
-            h=this.__booleanSql("HAVING",params.having),
-            o=this.__orderBy(params.order),
-            l=this.__limit(params.limit)
+            arrJoin=this.#join(params.joins),
+            w=this.#booleanSql("WHERE",params.where),
+            g=this.#groupBy(params.group),
+            h=this.#booleanSql("HAVING",params.having),
+            o=this.#orderBy(params.order),
+            l=this.#limit(params.limit)
 
         if(!w)
         {
-            w=this.__booleanSql("WHERE",`(${search})>1`)
+            w=this.#booleanSql("WHERE",`(${search})>1`)
         }else {
 
-            w =this.__booleanSql("WHERE",`(${w.replace(/^[\s]*where[\s]+(.*)/i,"$1")}) AND (${search})>1`)
+            w =this.#booleanSql("WHERE",`(${w.replace(/^[\s]*where[\s]+(.*)/i,"$1")}) AND (${search})>1`)
         }
         if(!o)
         {
-            o = this.__orderBy("puntaje_busqueda DESC")
+            o = this.#orderBy("puntaje_busqueda DESC")
         }
         if(params.campos instanceof Array)
         {
@@ -143,9 +143,9 @@ class prosesingSql
         }else{
             params.campos=[`(${search}) as puntaje_busqueda`,this.tabla + ".*"]
         }
-        arrSql.push(this.__campos(params.campos))
+        arrSql.push(this.#campos(params.campos))
         arrSql.push("FROM")
-        arrSql.push(this.__helpers.protectIdentifiers(this.tabla))
+        arrSql.push(this.#helpers.protectIdentifiers(this.tabla))
         if(arrJoin.length>0)
             arrSql.push(arrJoin.join(" "))
         if(w)
@@ -166,7 +166,7 @@ class prosesingSql
     * @param {array} campos en los que se realizara la busqueda
     * @return {string}
     */
-    __campoBusqueda(cadena, campos)
+    #campoBusqueda(cadena, campos)
     {
         if (cadena instanceof Array)
         {
@@ -176,7 +176,7 @@ class prosesingSql
         let select = ""
         for(let i in campos)
         {
-            let campo=this.__helpers.protectIdentifiers(campos[i])
+            let campo=this.#helpers.protectIdentifiers(campos[i])
             select+=`(${campo} is NOT NULL AND ${campo} like '%${cadena}%')+(${campo} is NOT NULL AND ${campo} like '${cadena}%')+`
         }
 
@@ -188,7 +188,7 @@ class prosesingSql
                 continue
             for(let j in campos)
             {
-                let campo =this.__helpers.protectIdentifiers(campos[j])
+                let campo =this.#helpers.protectIdentifiers(campos[j])
                 select += `(${campo} is NOT NULL AND ${campo} like '%${palabra}%') + (${campo} is NOT NULL AND ${campo} like '${palabra}%')+`
 
             }
@@ -202,7 +202,7 @@ class prosesingSql
                 select+="((CONCAT("
                 for(let i in campos)
                 {
-                    let campo=this.__helpers.protectIdentifiers(campos[i])
+                    let campo=this.#helpers.protectIdentifiers(campos[i])
                     let espace = !/[\d]+/.test(i) ? "''" : "' '"
                     select+=`IF(${campo} IS NOT NULL,${campo},' '),${espace},`
                 }
@@ -211,7 +211,7 @@ class prosesingSql
             } else if (campos.length == 1)
             {
                 select+="(0)"
-                campos[0] = this.__helpers.protectIdentifiers(campos[0])
+                campos[0] = this.#helpers.protectIdentifiers(campos[0])
                 // solo=`* (IF(${campos[0]}='${cadena}',0,1))+(IF(${campos[0]}='${cadena}',1,0))`
             }
         } else
@@ -227,7 +227,7 @@ class prosesingSql
     */
     delete(where)
     {
-        return `DELETE FROM ${this.__helpers.protectIdentifiers(this.tabla)} ${this.__booleanSql("WHERE",where)};`
+        return `DELETE FROM ${this.#helpers.protectIdentifiers(this.tabla)} ${this.#booleanSql("WHERE",where)};`
     }
     /**
     * genera una sentencia sql update valida
@@ -264,11 +264,11 @@ class prosesingSql
                 data=this.bindDataSmt(i,sets[i])
             }else
             {
-                data=this.__helpers.formatVarInsert(sets[i],i)
+                data=this.#helpers.formatVarInsert(sets[i],i)
             }
-            col.push(this.__helpers.protectIdentifiers(i) +"="+ data)
+            col.push(this.#helpers.protectIdentifiers(i) +"="+ data)
         }
-        return `UPDATE ${this.__helpers.protectIdentifiers(this.tabla)} SET ${col.join(",")} ${this.__booleanSql("WHERE",where)};`
+        return `UPDATE ${this.#helpers.protectIdentifiers(this.tabla)} SET ${col.join(",")} ${this.#booleanSql("WHERE",where)};`
     }
     /**
     * genera una sentencia insert sql valida
@@ -287,7 +287,7 @@ class prosesingSql
                 {
                     campos[coll.name]=this.nextAutoincrementValue
                 }
-                if(this.__verifyCampo(coll,campos[coll.name]))
+                if(this.#verifyCampo(coll,campos[coll.name]))
                 {
                     attrs.push(coll.name)
                     if(this.smt)
@@ -295,7 +295,7 @@ class prosesingSql
                         col.push(this.bindDataSmt(coll.name,campos[coll.name]))
                     }else
                     {
-                        col.push(this.__helpers.formatVarInsert(campos[coll.name],coll.name))
+                        col.push(this.#helpers.formatVarInsert(campos[coll.name],coll.name))
                     }
                 }
             }
@@ -309,7 +309,7 @@ class prosesingSql
                 {
                     campos[i]=this.nextAutoincrementValue
                 }
-                if(this.__verifyCampo(coll,campos[i]))
+                if(this.#verifyCampo(coll,campos[i]))
                 {
                     attrs.push(coll.name)
                     if(this.smt)
@@ -317,7 +317,7 @@ class prosesingSql
                         col.push(this.bindDataSmt(coll.name,campos[i]))
                     }else
                     {
-                        col.push(this.__helpers.formatVarInsert(campos[i],coll.name))
+                        col.push(this.#helpers.formatVarInsert(campos[i],coll.name))
                     }
                 }
             }
@@ -325,13 +325,13 @@ class prosesingSql
         let columnas = ""
         if (attrs)
         {
-            columnas = `(${this.__helpers.campos(attrs) })`
+            columnas = `(${this.#helpers.campos(attrs) })`
         }
-        return `INSERT INTO ${this.__helpers.protectIdentifiers(this.tabla)} ${columnas} VALUES (${col.join(",")});`
+        return `INSERT INTO ${this.#helpers.protectIdentifiers(this.tabla)} ${columnas} VALUES (${col.join(",")});`
 
     }
 
-    __verifyCampo(coll,value)
+    #verifyCampo(coll,value)
     {
         return !((
             (coll.autoincrement || coll.defaultNull)  &&
@@ -398,18 +398,18 @@ class prosesingSql
     {
         let params=[]
 
-        params=this.__resolveParamsSelect(campos,joins,where,group,having,order,limit)
+        params=this.#resolveParamsSelect(campos,joins,where,group,having,order,limit)
         let arrSql=[],
-            arrJoin=this.__join(params.joins),
-            w=this.__booleanSql("WHERE",params.where),
-            g=this.__groupBy(params.group),
-            h=this.__booleanSql("HAVING",params.having),
-            o=this.__orderBy(params.order),
-            l=this.__limit(params.limit)
-
-        arrSql.push(this.__campos(params.campos))
+            arrJoin=this.#join(params.joins),
+            w=this.#booleanSql("WHERE",params.where),
+            g=this.#groupBy(params.group),
+            h=this.#booleanSql("HAVING",params.having),
+            o=this.#orderBy(params.order),
+            l=this.#limit(params.limit)
+
+        arrSql.push(this.#campos(params.campos))
         arrSql.push("FROM")
-        arrSql.push(this.__helpers.protectIdentifiers(this.tabla))
+        arrSql.push(this.#helpers.protectIdentifiers(this.tabla))
         if(arrJoin.length>0)
             arrSql.push(arrJoin.join(" "))
         if(w)
@@ -434,7 +434,7 @@ class prosesingSql
     * es NATURAL
     * @return {string}
     */
-    __join(join)
+    #join(join)
     {
         let J = []
         //let keys = this.OrderColum
@@ -454,21 +454,21 @@ class prosesingSql
                     if(typeof v==="string" && /(!=|>=|<=|=|>|<)/.test(v))
                     {
 
-                        let u=this.__helpers.protectIdentifiersBolean(v)
+                        let u=this.#helpers.protectIdentifiersBolean(v)
                         using = `ON(${u})`
                     }else if( v instanceof Array)
                     {
                         for(let i in v)
                         {
-                            v[i]=this.__helpers.protectIdentifiers(v[i])
+                            v[i]=this.#helpers.protectIdentifiers(v[i])
                         }
                         let joined=v.join(",")
                         using = `USING(${joined})`
                     }else if(typeof v==="object")
                     {
-                        using = `ON(${this.__helpers.object2boleandSql(v,true)})`
+                        using = `ON(${this.#helpers.object2boleandSql(v,true)})`
                     }else {
-                        using = `USING(${this.__helpers.protectIdentifiers(v)})`
+                        using = `USING(${this.#helpers.protectIdentifiers(v)})`
                     }
                 }else
                 {
@@ -495,7 +495,7 @@ class prosesingSql
 
                 }
                 //" " . $tipe . " JOIN " . $this->Driver->ProtectIdentifiers($tab->Tabla()) . " " . $using
-                J.push(`${tipe} JOIN ${this.__helpers.protectIdentifiers(tabla)} ${using}`.replace(/ +$/,""))
+                J.push(`${tipe} JOIN ${this.#helpers.protectIdentifiers(tabla)} ${using}`.replace(/ +$/,""))
 
             }
         }
@@ -508,11 +508,11 @@ class prosesingSql
     * @param {string|object} sql
     * @return {string}
     */
-    __booleanSql(type,sql)
+    #booleanSql(type,sql)
     {
         if (typeof sql==="object" && sql!==null)
         {
-            return  type+" " +this.__helpers.object2boleandSql(sql)
+            return  type+" " +this.#helpers.object2boleandSql(sql)
         }else if(sql!==undefined && sql!==null)
         {
             return  type+" " +sql.replace(new RegExp(`^[\\s]*${type}[\\s]+(.*)`,"i"),"$1")
@@ -525,20 +525,20 @@ class prosesingSql
     * @param {array} campos - lista de campos
     * @return {string}
     */
-    __campos(campos)
+    #campos(campos)
     {
         if (!(campos instanceof Array) || campos===[])
         {
-            return  this.__helpers.campos([ this.tabla + ".*"])
+            return  this.#helpers.campos([ this.tabla + ".*"])
         }
-        return  this.__helpers.campos(campos)
+        return  this.#helpers.campos(campos)
     }
     /**
     * genera el sql para pa el group by de una sentencia select
     * @param {array|string} group - lista de campos
     * @return {string}
     */
-    __groupBy(group)
+    #groupBy(group)
     {
         if (group instanceof Array)
         {
@@ -557,7 +557,7 @@ class prosesingSql
     * @param {array|string} order - lista de campos
     * @return {string}
     */
-    __orderBy(order)
+    #orderBy(order)
     {
         if (order instanceof Array)
         {
@@ -576,7 +576,7 @@ class prosesingSql
     * @param {array|string} limit - lista de campos
     * @return {string}
     */
-    __limit(limit)
+    #limit(limit)
     {
         if(/^[\s]*LIMIT[\s]+/i.test(limit))
         {
@@ -599,7 +599,7 @@ class prosesingSql
     * @param {array|string|object} limit
     * @return {object} - parametros
     */
-    __resolveParamsSelect(campos,joins,where,group,having,order,limit)
+    #resolveParamsSelect(campos,joins,where,group,having,order,limit)
     {
         if(typeof campos==="object" && campos!==null && !(campos instanceof Array) &&
         ( campos.campos!==undefined

package/license

@@ -1,4 +1,4 @@
-Copyright (c) 2018 Enyerber Franco (enyerverfranco@gmial.com) and contributors
+Copyright (c) 2018 Enyerber Franco (enyerverfranco@gmail.com) and contributors
 
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbtabla",
-  "version": "0.8.7",
+  "version": "2.0.0",
   "description": "interface de alto nivel para sql",
   "license": "MIT",
   "author": "enyerverfranco@gmail.com",
@@ -11,7 +11,7 @@
   "main": "index.js",
   "scripts": {
     "lint": "eslint  ./index.js ./lib",
-    "test": "mocha ./test/index.js"
+    "test": "node --test ./test/index.js"
   },
   "keywords": [
     "sql",
@@ -20,10 +20,14 @@
     "posgresql"
   ],
   "devDependencies": {
-    "eslint": "^5.9.0",
-    "mocha": "^5.2.0"
+    "@eslint/js": "^10.0.1",
+    "eslint": "^10.1.0",
+    "globals": "^17.4.0"
   },
   "dependencies": {
-    "tabla-model": "^1.0.3"
+    "tabla-model": "^2.0.0"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
-}
+}

package/refactor_dbtabla.js

@@ -0,0 +1,36 @@
+const fs = require('fs');
+const path = require('path');
+
+const libDir = 'c:/programacion/dbtabla/dbtabla/lib';
+
+// 1. Refactor Connect.js
+let connectFile = path.join(libDir, 'Connect.js');
+let connectCode = fs.readFileSync(connectFile, 'utf8');
+connectCode = connectCode.replace(/class Connect\s*\{/, 'class Connect {\n    #escapeChar;\n    #reserveIdentifiers;\n    #ar_aliased_tables;\n    #dbprefix;\n    #swap_pre;\n    #information_schema;\n    #models;\n    #caheTablas;\n    #createdTables;\n    #escapeString;');
+connectCode = connectCode.replace(/this\.__/g, 'this.#');
+connectCode = connectCode.replace(/^(\s*)__([a-zA-Z0-9_]+)\s*\(/gm, '$1#$2(');
+fs.writeFileSync(connectFile, connectCode);
+
+// 2. Refactor dbTabla.js
+let dbTablaFile = path.join(libDir, 'dbTabla.js');
+let dbTablaCode = fs.readFileSync(dbTablaFile, 'utf8');
+dbTablaCode = dbTablaCode.replace(/class dbTabla\s*\{/, 'class dbTabla {\n    #connection;\n    #lastSql;\n    #keys;\n    #callbackKey;\n    #config;\n\n    get lastSql() { return this.#lastSql; }\n');
+dbTablaCode = dbTablaCode.replace(/this\.__/g, 'this.#');
+dbTablaCode = dbTablaCode.replace(/^(\s*)__([a-zA-Z0-9_]+)\s*\(/gm, '$1#$2(');
+fs.writeFileSync(dbTablaFile, dbTablaCode);
+
+// 3. Refactor procesingSql.js
+let procesingSqlFile = path.join(libDir, 'procesingSql.js');
+let procesingSqlCode = fs.readFileSync(procesingSqlFile, 'utf8');
+procesingSqlCode = procesingSqlCode.replace(/class prosesingSql\s*\{/, 'class prosesingSql {\n    #helpers;');
+procesingSqlCode = procesingSqlCode.replace(/this\.__/g, 'this.#');
+procesingSqlCode = procesingSqlCode.replace(/^(\s*)__([a-zA-Z0-9_]+)\s*\(/gm, '$1#$2(');
+fs.writeFileSync(procesingSqlFile, procesingSqlCode);
+
+// 4. Refactor dbResult.js (read exposed property)
+let dbResultFile = path.join(libDir, 'dbResult.js');
+let dbResultCode = fs.readFileSync(dbResultFile, 'utf8');
+dbResultCode = dbResultCode.replace(/dbTabla\.__lastSql/g, 'dbTabla.lastSql');
+fs.writeFileSync(dbResultFile, dbResultCode);
+
+console.log('Refactoring completed successfully.');