backend-plus 2.0.0-rc.3 → 2.0.0-rc.31

package/lib/backend-plus.js

@@ -54,6 +54,7 @@ var bestGlobals = require('best-globals');
 var coalesce = bestGlobals.coalesce;
 var changing = bestGlobals.changing;
 var datetime = bestGlobals.datetime;
+var splitRawRowIntoRow = bestGlobals.splitRawRowIntoRow;
 const escapeRegExp = bestGlobals.escapeRegExp;
 var isLowerIdent = bestGlobals.isLowerIdent;
 
@@ -96,7 +97,13 @@ class AppBackend{
         /** @type {{path:string}[]} */
         this.appStack=[];
         /** @type {{message:string; fun:()=>void}[]} */
-        this.shootDownCallbackList=[];
+        this.shutdownCallbackList=[];
+        this.sessionStores={
+            file: SessionFileStore,
+            memory: memorystore,
+            memoryDevel: BindMemoryPerodicallySaved(this),
+            "memory-saved": BindMemoryPerodicallySaved(this),
+        }
         if(!this.rootPath){
             console.log('ATENCIÓN hay que poner be.rootPath antes de llamar a super()');
             this.rootPath=Path.resolve(__dirname,'..');
@@ -118,11 +125,14 @@ class AppBackend{
         this.tableStructures = {};
         this.configStaticConfig();
         /** @type {null|()=>Promise<void>} */
-        this.shootDownBackend = null;
+        this.shutdownBackend = null;
         /** @type {bp.Server} */
         // @ts-ignore
         this.server = null;
     }
+    esJavascript(type){
+        return ['js','mjs'].includes(type)
+    }
     clearCaches(){
         this.caches={
             procedures:{}
@@ -357,6 +367,8 @@ AppBackend.prototype.i18n.messages.es={
     }
 };
 
+function BindMemoryPerodicallySaved(be){
+    return (
 /**
  * @param {Express.Session} session
  */
@@ -405,7 +417,7 @@ function MemoryPerodicallySaved(session){
                 console.log('dumping sessions every',dumpEverySeconds,'seconds');
                 var errorsToShow=4;
                 // TODO: hangs the server in devel mode
-                setInterval(function(){
+                var interval = setInterval(function(){
                     try{
                         fs.writeFile(fileName,json4all.stringify(store.store.dump()));
                     }catch(err){
@@ -416,18 +428,15 @@ function MemoryPerodicallySaved(session){
                         }
                     }
                 },dumpEverySeconds*1000);
+                be.shutdownCallbackListAdd({
+                    message:'session saver',
+                    fun:()=>clearInterval(interval)
+                })
             });
         }
     }
     return MemoryDevelConstructor;
-}
-
-var sessionStores={
-    file: SessionFileStore,
-    memory: memorystore,
-    memoryDevel: MemoryPerodicallySaved,
-    "memory-saved": MemoryPerodicallySaved,
-}
+})}
 
 /**
  * @param {string} text 
@@ -455,8 +464,14 @@ AppBackend.prototype.setStaticConfig = function setStaticConfig(defConfigYamlStr
 }
 
 AppBackend.prototype.configList = function configList(){
-    var list=[this.staticConfig];
-    if(!this.staticConfig["client-setup"].title && fs.existsSync(this.rootPath+'/def-config.yaml')){
+    var list=[
+        {
+            package:{
+                version: packagejson.version
+            }
+        },
+        this.staticConfig];
+    if(!this.staticConfig["client-setup"]?.title && fs.existsSync(this.rootPath+'/def-config.yaml')){
         console.log('DEPRECATED!!!!!!')
         console.error('ERROR el def-config hay que ponerlo dentro de staticConfig');
         console.log('DEPRECATED!!!!!!')
@@ -466,7 +481,7 @@ AppBackend.prototype.configList = function configList(){
         list.push(this.rootPath+'/def-config.yaml')
     };
     list.push(this.rootPath+'/local-config');
-    list.push(process.env.BACKEND_PLUS_LOCAL_CONFIG||{});
+    list.push(process.env.BACKEND_PLUS_LOCAL_CONFIG?.trim()||{});
     return list;
 };
 
@@ -503,6 +518,11 @@ AppBackend.prototype.canChangePass = async function canChangePass(reqOrContext,
     return be.isAdmin(reqOrContext);
 }
 
+AppBackend.prototype.shutdownCallbackListAdd = function(messageFun){
+    this.shutdownCallbackList.push(messageFun);
+}
+
+
 AppBackend.prototype._Browsers = {
     Edge:      {short:'Ed'  , minVer:14  , polly:true},
     Konqueror: {short:'Kq'  , minVer:null, polly:true},
@@ -519,7 +539,7 @@ var imgExts =  ['jpg', 'png', 'jpeg', 'ico', 'gif', 'svg']
 
 AppBackend.prototype.exts = {
     img: imgExts,
-    normal: ['', 'js', 'map', 'html', 'css', ...imgExts, 'appcache', 'manifest', 'json', 'webmanifest', 'zip', 'pdf', ...fontExts, 'xlsx', 'csv']
+    normal: ['', 'js', 'map', 'html', 'css', ...imgExts, 'appcache', 'manifest', 'json', 'webmanifest', 'zip', 'pdf', ...fontExts, 'xlsx', 'csv', 'mjs']
 };
 
 /**
@@ -625,32 +645,33 @@ AppBackend.prototype.start = function start(opts){
         // @ts-ignore : only for testing */
         this.getMainApp = function getMainApp(){ return mainApp; };
     }
-    this.shootDownBackend = function shootDownBackend(){
+    this.shutdownBackend = async function shutdownBackend(){
         console.log('shooting down:');
-        return new Promise(function(resolve,reject){
-            console.log('*','express server');
-            be.server.close(/** @param {Error} err */function(err){
-                if(err){
-                    console.log('*', err)
-                    reject(err);
-                }else{
-                    resolve();
-                }
-            });
-        }).then(async function(){
-            while(be.shootDownCallbackList.length){
-                var nextCallback=be.shootDownCallbackList.pop();
-                if(nextCallback!=null){
-                    console.log('*',nextCallback.message);
-                    await nextCallback.fun();
-                }
-            }
-        }).then(function(){
-            console.log('pg pool balance',pg.poolBalanceControl());
-            // @ts-ignore al hacer shootDown ya no hay mainApp. 
-            mainApp = null;
-            logWhy && logWhy();
-        });
+        var waitFor = [
+            new Promise(function(resolve,reject){
+                console.log('*','express server');
+                be.server.close(/** @param {Error} err */function(err){
+                    if(err){
+                        console.log('*', err)
+                        reject(err);
+                    }else{
+                        console.log('*','express server done!')
+                        resolve();
+                    }
+                });
+            }),
+            ...(be.shutdownCallbackList.map(x => (async function(){
+                console.log('shut:', x.message)
+                await x.fun()
+                console.log('done:', x.message)
+            })()))
+        ];
+        console.log('*', 'waiting for all')
+        await Promise.all(waitFor);
+        console.log('*', 'all done')
+        mainApp = null;
+        console.log('* logWhy',logWhy)
+        logWhy && logWhy();
     };
     return Promise.resolve().then(function(){
         var configList=be.configList();
@@ -681,10 +702,10 @@ AppBackend.prototype.start = function start(opts){
                 }
                 var sessionStoreName=be.config.server["session-store"];
                 if(sessionStoreName){
-                    if(config.devel && sessionStores[sessionStoreName+'Devel']){
+                    if(config.devel && be.sessionStores[sessionStoreName+'Devel']){
                         sessionStoreName+='Devel';
                     }
-                    var storeModule = sessionStores[sessionStoreName];
+                    var storeModule = be.sessionStores[sessionStoreName];
                     be.config.login.plus.store.module = storeModule;
                 }
                 be.config.install.dump.db.owner=coalesce(be.config.db.owner,be.config.install.dump.db.owner,be.config.db.user);
@@ -704,7 +725,7 @@ AppBackend.prototype.start = function start(opts){
                     throw new Error("backend-plus: Motor not recongnized: "+be.config.db.motor);
                 }
                 be.db = pg;
-                be.dbUserNameExpr="split_part(current_setting('application_name'),' ',1)";
+                be.dbUserNameExpr="get_app_user()";
                 be.dbUserRolExpr=`(select ${be.db.quoteIdent(be.config.login.rolFieldName)} 
                     from ${be.config.login.schema?be.db.quoteIdent(be.config.login.schema)+'.':''}${be.db.quoteIdent(be.config.login.table)} 
                     where ${be.db.quoteIdent(be.config.login.userFieldName)} = ${be.dbUserNameExpr})`
@@ -760,6 +781,7 @@ AppBackend.prototype.start = function start(opts){
                     pg.log.inFileName = 'last-pg-error-local.sql'
                     pg.logLastError.inFileName = 'last-pg-error-local.sql'
                 }
+                be.config.db.search_path = be.config.db.search_path ?? [be.config.db.schema, 'public'];
                 be.getDbClient = function getDbClient(req){
                     var paramsDb = be.DoubleDragon?.dbParams?.[req?.user?.[be.config.login.userFieldName]] ?? be.config.db;
                     return pg.connect(paramsDb).then(function(client){
@@ -771,7 +793,7 @@ AppBackend.prototype.start = function start(opts){
                         return client.query(
                             "SET application_name = "+be.db.quoteLiteral(dbAppName)
                         ).execute().then(function(){
-                            var search_path = be.config.db.search_path || [be.config.db.schema, 'public'];
+                            var search_path = be.config.db.search_path;
                             if(search_path.length>0){
                                 return client.query("set SEARCH_PATH TO "+be.db.quoteIdentList(search_path)).execute().then(function(){
                                     return client;
@@ -961,12 +983,18 @@ AppBackend.prototype.start = function start(opts){
                 loginPlusOpts.noLoggedUrlPath=be.config.login.unloggedLandPage;
             }
             mainApp.loginPlusManager.init(mainApp,changing(be.config.login.plus,loginPlusOpts));
-            be.shootDownCallbackList.push({
+            be.shutdownCallbackListAdd({
                 message:'login-plus manager',
                 fun:function(){
                     mainApp.loginPlusManager.closeManager();
                 }
             });
+            be.shutdownCallbackListAdd({
+                message:'pg',
+                fun:function(){
+                    pg.shutdown();
+                }
+            });
             mainApp.loginPlusManager.setValidatorStrategy(
                 function(req, username, password, done) {
                     var client;
@@ -1130,7 +1158,7 @@ AppBackend.prototype.start = function start(opts){
         }
         return be.sendMail({
             to: be.config.mailer?.supervise?.to,
-            subject: `npm start ${be.config["client-setup"].title || packagejson.name} ok ✔️`,
+            subject: `npm start ${be.config["client-setup"]?.title || packagejson.name} ok ✔️`,
             text:`Inicio del servicio: ${new Date().toJSON()}
             
             Contexto: ${os.userInfo().username} ${process.cwd()}
@@ -1152,7 +1180,7 @@ AppBackend.prototype.start = function start(opts){
         }
         var mailDeAvisoDeFalla = be.sendMail({
             to: be.config.mailer?.supervise?.to,
-            subject: `npm start ${be.config["client-setup"].title || packagejson.name} fallido 🛑`,
+            subject: `npm start ${be.config["client-setup"]?.title || packagejson.name} fallido 🛑`,
             text:`Falla en el inicio del servicio: ${new Date().toJSON()}
             
             Contexto: ${os.userInfo().username} ${process.cwd()}
@@ -1209,13 +1237,14 @@ AppBackend.prototype.checkDatabaseStructure = async function checkDatabaseStruct
         }
         if(be.config.login?.forget){
             try{
-                await client.query(`select tokentype, info, due from tokens limit 1`).fetchOneRowIfExists();
+                await client.query(`select tokentype, info, due from his.tokens limit 1`).fetchOneRowIfExists();
             }catch(err){
                 var mensaje = `
                     --------quizas falten los campos en la tabla tokens:
                     alter table tokens add column tokentype text;
                     alter table tokens add column info jsonb;
                     alter table tokens add column due timestamp;
+                    --------quizas falte moverla al esquema his.
                 `;
                 err.message += mensaje;
                 console.log(mensaje)
@@ -1253,6 +1282,21 @@ AppBackend.prototype.checkDatabaseStructure = async function checkDatabaseStruct
         `;
         throw new Error(message);
     }
+    var {rows: sql_routines} = await client.query(`SELECT routine_name, routine_schema, routine_definition
+        FROM information_schema.routines
+        WHERE routine_schema in (${be.config.db.search_path.map(path => be.db.quoteLiteral(path)).join(', ')})
+    `).fetchAll();
+    var sqlRoutines = likeAr.toPlainObject(sql_routines, 'routine_name');
+    var message = ''
+    likeAr(AppBackend.prototype.sql_routines).forEach((routine_name, def) => {
+        if (sqlRoutines[routine_name] && def.dump.includes(sqlRoutines[routine_name].routine_definition)) {
+            message += `
+                ----- hay que crear o actualizar la rutina ${routine_name}:
+                ${dump}
+                `;
+        }
+    })
+    if (message) throw new Error(message);
 };
 
 AppBackend.prototype.postConfig = function postConfig(){
@@ -1511,17 +1555,17 @@ AppBackend.prototype.addProcedureServices = function addProcedureServices(forUnl
                                     });
                                 }else{
                                     if(progressInfo.lengthComputable){
-                                        if(new Date()-(context.lastMessageSended||0) > 500 || progressInfo.force){
-                                            context.lastMessageSended=new Date();
+                                        if (!context.lastMessageSended) {
+                                            context.lastMessageSended = {}
+                                        }
+                                        if(new Date()-(context.lastMessageSended[progressInfo.idGroup]||0) > 500 || progressInfo.force){
+                                            context.lastMessageSended[progressInfo.idGroup]=new Date();
                                             res.write(JSON.stringify({progress:progressInfo})+"\n");
                                             if(progressInfo.total){
                                                 var rate100=Math.floor(progressInfo.loaded*100/progressInfo.total);
                                                 var rate1000=Math.floor(progressInfo.loaded*1000/progressInfo.total);
-                                                if(rate100<1 && progressInfo.loaded>0){
-                                                    progress2send={message:'('+(rate1000||'½')+'‰)', ephemeral:true};
-                                                }else{
-                                                    progress2send={message:rate100+'%', ephemeral:true};
-                                                }
+                                                var message = rate100<1 && progressInfo.loaded>0 ? '('+(rate1000||'½')+'‰)' : rate100+'%';
+                                                progress2send={message, ephemeral:true, idGroup:progressInfo.idGroup};
                                             }
                                         }else{
                                             progress2send=null;
@@ -1724,14 +1768,26 @@ function require_resolve(moduleName){
     return resolved;
 }
 
-function resolve_module_dir(moduleName,path){
+function resolve_module_dir(moduleName,path,fileToCheck){
     var baseDir;
     if(packagejson.name==moduleName){
         baseDir=Path.join(process.cwd(), packagejson.main);
     }else{
         baseDir=require_resolve(moduleName);
     }
-    return Path.join(Path.dirname(baseDir),path||'');
+    var resultDir = Path.join(Path.dirname(baseDir),path||'');
+    if (fileToCheck) {
+        fs.stat(Path.join(resultDir, fileToCheck)).then(function(status){
+            if (!status) {
+                console.error('Error resolve_module_dir in:',resultDir,'no:',fileToCheck);
+            } else if(!status.isFile()) {
+                console.error('Error resolve_module_dir in:',resultDir,',',fileToCheck,'is not a file');
+            }
+        },function(err){
+            console.error('Error resolve_module_dir in:',resultDir,'err:',err);
+        });
+    }
+    return resultDir;
 }
 
 AppBackend.prototype.optsGenericForFiles = function optsGenericForFiles(req, opts){
@@ -1894,6 +1950,9 @@ AppBackend.prototype.addUnloggedServices = function addUnloggedServices(mainApp,
     // http://localhost:3033/img/login-logo-icon.png
     mainApp.get(Path.posix.join(baseUrl,'/img/login-logo-icon.png'), async function(req,res,next){
         var buscar = [
+            'unlogged/img/login-logo-icon.svg', 
+            'dist/unlogged/img/login-logo-icon.svg', 
+            'dist/client/unlogged/img/login-logo-icon.svg', 
             'unlogged/img/login-logo-icon.png', 
             'dist/unlogged/img/login-logo-icon.png', 
             'dist/client/unlogged/img/login-logo-icon.png', 
@@ -1921,7 +1980,7 @@ AppBackend.prototype.addUnloggedServices = function addUnloggedServices(mainApp,
         if(baseUrl=='/'){
             baseUrl='';
         }   
-        let baseLib = baseUrl + '/' + (moduleDef.path ? moduleDef.path : moduleDef.type == 'js'? 'lib': 'css');
+        let baseLib = baseUrl + '/' + (moduleDef.path ? moduleDef.path : be.esJavascript(moduleDef.type)? 'lib': 'css');
         try {
             var allowedExts=(moduleDef.type=='js'?['js','map']:[moduleDef.type]);
             mainApp.use(baseLib, serveContent(resolve_module_dir(moduleDef.module, moduleDef.modPath), { allowedExts }));
@@ -1935,7 +1994,7 @@ AppBackend.prototype.addUnloggedServices = function addUnloggedServices(mainApp,
                 }
             }
         } catch (error) {
-            console.error('ERROR: No se pudo servir el módulo ' + moduleDef.module);
+            console.error('ERROR: No se pudo servir el módulo', moduleDef.module);
             throw error;
         }
     })
@@ -2056,6 +2115,7 @@ AppBackend.prototype.clientIncludes = function clientIncludes(req, opts) {
 
 AppBackend.prototype.clientIncludesCompleted = function clientIncludesCompleted(req, opts) {
     let list = this.clientIncludes(req, opts);
+    var be = this;
     if(this.config.devel && this.config.devel.useFileDevelopment){
         list=list.map(includeDef=>{
             if(includeDef.fileProduction){
@@ -2071,14 +2131,15 @@ AppBackend.prototype.clientIncludesCompleted = function clientIncludesCompleted(
     return list.map(inclusion =>{
         var filename = inclusion.file? inclusion.file: (inclusion.module? Path.basename(require_resolve(inclusion.module,rPaths)): '');
         return changing({
-            src: inclusion.type == 'js' ? ((inclusion.path ? inclusion.path : 'lib') + '/' + (inclusion.file ? inclusion.file : filename)) : '',
+            src: be.esJavascript(inclusion.type) ? ((inclusion.path ? inclusion.path : 'lib') + '/' + (inclusion.file ? inclusion.file : filename)) : '',
             href: inclusion.type == 'css' ? ((inclusion.path ? inclusion.path : 'css') + '/' + (inclusion.file ? inclusion.file : (inclusion.module + '.css'))) : ''
         }, inclusion);
     });
 }
 
 AppBackend.prototype.clientModules = function clientModules(req, opts) {
-    return { scripts: this.clientIncludesCompleted(req, opts).filter(x => x.type == 'js').map(mod => {return { src: mod.src }})};
+    var be = this;
+    return { scripts: this.clientIncludesCompleted(req, opts).filter(x => be.esJavascript(x.type)).map(mod => {return { src: mod.src, type:mod.type=='mjs'?"module":null }})};
 }
 
 /**
@@ -2181,7 +2242,7 @@ AppBackend.prototype.mainPage = function mainPage(req, offlineMode, opts){
     }
     return html.html(attr,[
         html.head([
-            html.title(be.config["client-setup"].title),
+            html.title(be.config["client-setup"]?.title),
             html.meta({charset:"utf-8"}),
             viewportAttrs?html.meta(viewportAttrs):null,
             html.link({href: opts.icons.iconShortcut , rel: "shortcut icon", type: "image/png"}),
@@ -2621,6 +2682,30 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
     }
     var schema=db.quoteIdent(be.config.db.schema);
     linesCreate.push("set role to "+owner+";");
+    linesCreate.push(`do 
+    $do$
+    declare
+      vExpectedVersion text := '${be.config.db["min-version"]}';
+      vCurrentVersion  text := (select setting from pg_settings where name = 'server_version');
+    begin
+      if jsonb('['||replace(vCurrentVersion,'.',',')||']') < jsonb('['||replace(vExpectedVersion,'.',',')||']') then
+        raise exception 'BACKEND-PLUS DUMP: Old PostrgreSQL Version % expected %', vCurrentVersion, vExpectedVersion;
+      end if;
+    end;
+    $do$;
+    `);
+    linesCreate.push(`do 
+    $do$
+    declare
+      vExpected text := 'UTF8';
+      vCurrent  text := coalesce((select setting from pg_settings where name = 'server_encoding'),'unknown');
+    begin
+      if vCurrent is distinct from vExpected then
+        raise exception 'BACKEND-PLUS DUMP: PostrgreSQL server_encoding %, expected %', vCurrent, vExpected;
+      end if;
+    end;
+    $do$;
+    `);
     linesCreate.push("drop schema if exists "+schema+' cascade;');
     if (be.config.install.dump["drop-his"]) {
         linesCreate.push("drop schema if exists his cascade;");
@@ -2804,10 +2889,11 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
                 lines.push('');
                 if(tableDef.sql.policies.enabled){
                     policyLines.push(`ALTER TABLE ${cualQuoteTableName} ENABLE ROW LEVEL SECURITY;`);
-                    ['all', 'select', 'insert', 'update', 'delete'].forEach((command)=>{
-                        var polcom=tableDef.sql.policies[command];
-                        if(polcom.using || polcom.check){
-                            policyLines.push(`CREATE POLICY bp_pol_${command} ON ${cualQuoteTableName} AS PERMISSIVE FOR ${command}`+
+                    [null, 'all', 'select', 'insert', 'update', 'delete'].forEach((command)=>{
+                        var polcom=tableDef.sql.policies[command] ?? {using: `true`, permissive:true};
+                        if(polcom?.using || polcom?.check){
+                            policyLines.push(`CREATE POLICY ${be.db.quoteIdent(polcom.name ?? `bp ${command ?? `base`}`)} ON ${cualQuoteTableName} `+
+                                `AS ${polcom.permissive ? `PERMISSIVE` : `RESTRICTIVE`} FOR ${command ?? `all`} TO ${be.config.db.user}`+
                                 (polcom.using?     ` USING ( ${polcom.using} )`:'')+
                                 (polcom.check?` WITH CHECK ( ${polcom.check} )`:'')+';'
                             );
@@ -2842,8 +2928,14 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
         if (err.code != 'ENOENT') throw err;
         try {
             var allTableContent = await fs.readFile('install/local-dump.psql','utf-8');
-            var startIndex = allTableContent.search(/\n-- Data for Name: /);
-            var lastIndex = allTableContent.search(/\nSELECT pg_catalog.setval/);
+            var startIndex = allTableContent.indexOf('-- Data for Name: ');
+            console.log('startIndex', startIndex);
+            var lastUseful = allTableContent.lastIndexOf('\nSELECT pg_catalog.setval') 
+            console.log('lastUseful', lastUseful);
+            if (lastUseful == -1) lastUseful = allTableContent.lastIndexOf('\n\\.\n');
+            console.log('lastUseful', lastUseful);
+            var lastIndex = allTableContent.indexOf('\n--', lastUseful);
+            console.log('lastIndex', lastIndex);
             allTableData = allTableContent.slice(startIndex, lastIndex);
         } catch(err) {
             if (err.code != 'ENOENT') throw err;
@@ -2920,29 +3012,39 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
                 }else{
                     var lines=content.split(/\r?\n/)
                         .filter(line => !(/^[-| ]*$/.test(line)) )
-                        .map(line => line.split(/(?<!(?:^|[^\\])(?:\\\\)*\\)\|/).map(item => item.trimRight().replace(/\\(.)/g,(_,l)=>(l=='t'?'\t':l=='r'?'\r':l=='n'?'\n':l=='s'?' ':l))) )
+                        .map(line => splitRawRowIntoRow(line))
                         .filter(line => line.length>1 || line.length==1 && line[0].trim() );
                     if(lines.length>1){
                         if(lines[0][0].startsWith('\ufeff')){
                             lines[0][0]=lines[0][0].replace('\ufeff','')
                         }
                         rows=lines.slice(1);
+                        var filteredFieldDef = lines[0].filter(filterField);
                         if(tablesWithStrictSequence[tableName]){
                             var dataString="COPY "+db.quoteIdent(tableName)+" ("+
-                                lines[0].filter(filterField).map(db.quoteIdent).join(', ')+
+                                filteredFieldDef.map(db.quoteIdent).join(', ')+
                                 ') FROM stdin;\n'+
                                 rows.map(function(line){
-                                    return line.filter(function(_,i){ return filterField(lines[0][i]);}).map(function(value){
-                                        return value===''?'\\N':value.replace(/\\/g,'\\\\').replace(/\t/g,'\\t').replace(/\n/g,'\\n').replace(/\r/g,'\\r');
+                                    return line.filter(function(_,i){ return filterField(lines[0][i]);}).map(function(value,i){
+                                        var def = tableDef.field[filteredFieldDef[i]];
+                                        return value==='' ? (
+                                                def.allowEmptyText && ('nullable' in def) && !def.nullable ? '' : '\\N'
+                                            ): value.replace(/\\/g,'\\\\').replace(/\t/g,'\\t').replace(/\n/g,'\\n').replace(/\r/g,'\\r');
                                     }).join('\t')+'\n';
                                 }).join('')+'\\.\n';
                         }else{
                             var dataString="insert into "+db.quoteIdent(tableName)+" ("+
-                                lines[0].filter(filterField).map(db.quoteIdent).join(', ')+
+                                filteredFieldDef.map(db.quoteIdent).join(', ')+
                                 ') values\n'+
                                 rows.map(function(line){
-                                    return "("+line.filter(function(_,i){ return filterField(lines[0][i]);}).map(function(value){
-                                        return value===''?'null':db.quoteNullable(value);
+                                    return "("+line.filter(function(_,i){ return filterField(lines[0][i]);}).map(function(value,i){
+                                        var def = tableDef.field[filteredFieldDef[i]];
+                                        if(def == null) {
+                                            throw Error("no se encuentra la columna "+filteredFieldDef[i]+" en "+tableName);
+                                        }
+                                        return value==='' ? (
+                                            def.allowEmptyText && ('nullable' in def) && !def.nullable ? "''" : 'null' 
+                                        ) : db.quoteNullable(value);
                                     }).join(', ')+")";
                                 }).join(',\n')+';\n';
                         }
@@ -2965,28 +3067,65 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
             console.log('silence "skipping content" messages in "local-config.yaml".install.dump.skip-content=true');
         }
     }
+    let installFolders = be.config.install.dump.folders ?? ['install']
     let texts = await Promise.all(
-        ['prepare.sql','pre-adapt.sql','adapt.sql']
-        .concat(be.config.install.dump.scripts['prepare'])
-        .concat(be.config.install.dump.scripts['post-adapt'])
-        .map(function(fileName){
-            return fs.readFile(be.rootPath+'/install/'+fileName, {encoding:'UTF8'}).catch(function(err){
-                if(err.code!='ENOENT'){
-                    throw err;
-                }
-                console.log("err:",err);
-                return '-- no '+fileName+'\n';
-            }).then(function(content){
-                return '-- '+fileName+'\n'+content;
-            });
+        [
+            ['prepare.sql'],
+            ['pre-adapt.sql'].concat(be.config.install.dump.scripts['pre-adapt']),
+            ['adapt.sql'],
+            be.config.install.dump.scripts['prepare'] ?? [],
+            be.config.install.dump.scripts['post-adapt'] ?? []
+        ]
+        .map(async function(fileNames){
+            if (!fileNames) return '';
+            var i = 0; 
+            return (await Promise.all(fileNames.map(async fileName => {
+                var content;
+                do {
+                    var folder = installFolders[i];
+                    try{
+                        content = await fs.readFile(be.rootPath+'/'+folder+'/'+fileName, {encoding:'UTF8'});
+                    } catch (err) {
+                        if(err.code!='ENOENT') throw err;
+                    }
+                    i++;
+                } while (i < installFolders.length && !content);
+                if (!content) {
+                    return '-- no '+fileName+'\n';
+                } else {
+                    return '-- '+folder+'/'+fileName+'\n'+content;
+                };
+            }))).join('\n')
         })
     );
+
+    var common = (await Promise.all(be.appStack.map(async function(stackNode){
+        var common = [];
+        for (var prefix of ['../', '../../']) {
+            try {
+                var dirName = Path.join(stackNode.path,prefix+'install').replace(regexpDistReplacer,'$1$2')
+                var list = await fs.readdir(dirName);
+            } catch (err) {
+                if (err.code != 'ENOENT') throw err;
+                var list = [];
+            }
+            for(var fileName of list){
+                if (fileName.endsWith('-fun.sql')) {
+                    common.push(await fs.readFile(Path.join(dirName,fileName), 'utf-8'));
+                }
+            }
+        }
+        return common.join('\n');
+    }))).join('\n');
+
     var prepareList=(be.config.install.dump.scripts['prepare']||[]);
     var mainSql=(
         (complete? linesCreate.join('\n'): '')+
         (complete||opts.forDump? searchPathline.join('\n'): '')+
+        '\n-- common'+
+        common+'\n'+
         (complete? '\n\n--prepare.sql\n'+ texts[0]+'\n\n' :'' )+
-        (complete? texts.slice(3,3+prepareList.length).join('\n\n')+'\n\n' : '' )+
+        (complete? texts[3] + '\n\n' : '' )+
         '\n-- functions\n' + functionLines.join('\n')+
         '\n-- lines \n' + lines.join('\n')+
         (complete? ('\n\n-- pre-ADAPTs\n'+texts[1]+'\n\n') : '' )+
@@ -2996,7 +3135,7 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
         '\n-- FKs\n' + fkLines.join('\n')+
         '\n-- index\n' + indexLines.join('\n')+
         '\n-- policies\n' + policyLines.join('\n')+
-        (complete? texts.slice(3+prepareList.length).join('\n\n')+'\n\n' : '' )+
+        (complete? texts[4] + '\n\n' : '' )+
         (complete? (be.config.install.dump.enances==='inline'?enancePart:'') :'')
     ).replace(/\uFEFF/g /*inner BOM replacing*/,'\n\n').replace(
         new RegExp(escapeRegExp(db.quoteIdent(be.config.install.dump.db["owner4special-scripts"])),'g'),
@@ -3117,6 +3256,8 @@ AppBackend.prototype.exportacionesGenerico = async function exportacionesGeneric
     if (typeof result[0].title !== "string" || typeof result[0].rows !== "object" && !(result[0].rows instanceof Array) ) {
         throw new Error ("exportacionesGenerico debe recibir {title:string, rows:Record<string, any>[]}")
     }
+    csvFileName = result[0].csvFileName ?? csvFileName;
+    fileName = result[0].fileName ?? fileName;
     await bestGlobals.sleep(100);
     context.informProgress({message:`buscando archivos recién generados`})
     /** @type {{url:string, label:string}[]} */