backend-plus 2.0.0-rc.7 → 2.0.0-rc.9

package/for-client/my-tables.js

@@ -690,16 +690,16 @@ myOwn.tableGrid = function tableGrid(tableName, mainElement, opts){
                     if (myOwn.config.config['grid-row-retain-moved-or-deleted'] && !force) { 
                         var depotsToRetain = grid.depots.filter(depot => depot.tick == tick);
                         for (depot of depotsToRetain) {
-                            depot.row['$refreshed'] = false
+                            depot['$refreshed'] = false
                             if (depot.tr && depot.tr.getAttribute('not-here')) depot.tr.removeAttribute('not-here')
                         }
                     }
                     while (depot = depotsToDelete.pop()) {
                         depot.manager.displayAsDeleted(depot, force ? 'change-ff' : 'unknown'); 
                         if (myOwn.config.config['grid-row-retain-moved-or-deleted']) { 
-                            if(!depot.row['$refreshed']){
+                            if(!depot['$refreshed']){
                                 grid.retrieveRowAndRefresh(depot,{retrieveIgnoringWhere:true})
-                                depot.row['$refreshed'] = true
+                                depot['$refreshed'] = true
                             }
                         }
                     }
@@ -1622,7 +1622,7 @@ myOwn.dialogDownload = function dialogDownload(grid){
                     }else{
                         separator='|';
                         var trans={
-                            '|':'\\|',
+                            '|':'\\x7C',
                             '\\':'\\\\',
                             '\r':'\\r',
                             '\n':'\\n',

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;
 
@@ -2937,7 +2938,7 @@ 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')){
@@ -3013,21 +3014,17 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
         for (var prefix of ['../', '../../']) {
             try {
                 var dirName = Path.join(stackNode.path,prefix+'install').replace(regexpDistReplacer,'$1$2')
-                console.log('********** buscando en', dirName, 'de', stackNode.path)
                 var list = await fs.readdir(dirName);
             } catch (err) {
                 if (err.code != 'ENOENT') throw err;
-                console.log(err);
                 var list = [];
             }
-            console.log(list)
             for(var fileName of list){
                 if (fileName.endsWith('-fun.sql')) {
                     common.push(await fs.readFile(Path.join(dirName,fileName), 'utf-8'));
                 }
             }
         }
-        console.log(common)
         return common.join('\n');
     }))).join('\n');
 
@@ -3169,6 +3166,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}[]} */

package/lib/procedures-table.js

@@ -1,7 +1,7 @@
 // @ts-check
 "use strict";
 
-var {datetime, changing, coalesce} = require('best-globals');
+var {datetime, changing, coalesce, splitRawRowIntoRow} = require('best-globals');
 var XLSX = require('xlsx');
 var fs = require('fs/promises')
 var fsSync = require('fs');
@@ -805,7 +805,8 @@ ProcedureTables = [
                         var rowsForUpsert=lines.slice(1).map(function(line){
                             var othersArray = [];
                             if(separator=='|'){
-                                var row = line.split(/(?<!(?:^|[^\\])(?:\\\\)*\\)\|/).map(item => item.trimRight().replace(/\\(.)/g,(_,l)=>(l=='t'?'\t':l=='r'?'\r':l=='n'?'\n':l=='s'?' ':l)));
+                                var row = splitRawRowIntoRow(line);
+
                             }else{
                                 var row=line.split(separator);
                             }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for the anti Pareto rule",
-  "version": "2.0.0-rc.7",
+  "version": "2.0.0-rc.9",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -32,7 +32,7 @@
     "@upgraded/locate-path": "^6.0.0-alfa.1",
     "ajax-best-promise": "^0.4.0",
     "backend-skins": "^0.1.15",
-    "best-globals": "^1.1.2",
+    "best-globals": "^1.1.3",
     "big.js": "^6.2.1",
     "body-parser": "^1.20.2",
     "cast-error": "^0.1.1",
@@ -41,7 +41,7 @@
     "cookie-parser": "^1.4.6",
     "dialog-promise": "^0.9.15",
     "discrepances": "^0.2.8",
-    "express": "^4.18.2",
+    "express": "^4.18.3",
     "express-session": "^1.18.0",
     "express-useragent": "^1.0.15",
     "fs-extra": "^11.2.0",
@@ -55,7 +55,7 @@
     "mini-tools": "^1.12.1",
     "moment": "^2.30.1",
     "multiparty": "^4.2.3",
-    "nodemailer": "^6.9.9",
+    "nodemailer": "^6.9.12",
     "numeral": "^2.0.6",
     "pg-promise-strict": "^1.3.3",
     "pikaday": "^1.8.2",
@@ -68,7 +68,7 @@
     "session-file-store": "^1.5.0",
     "sql-tools": "^0.1.2",
     "stack-trace": "^0.0.10",
-    "stylus": "0.62.0",
+    "stylus": "0.63.0",
     "type-store": "^0.4.0",
     "typed-controls": "^0.12.0",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz"
@@ -82,7 +82,7 @@
     "@types/js-yaml": "^4.0.9",
     "@types/mocha": "^10.0.6",
     "@types/multiparty": "~0.0.36",
-    "@types/node": "^20.11.19",
+    "@types/node": "^20.11.28",
     "@types/nodemailer": "^6.4.14",
     "@types/numeral": "~2.0.5",
     "@types/session-file-store": "^1.2.5",
@@ -90,20 +90,20 @@
     "@types/websql": "~0.0.30",
     "esprima": "^4.0.1",
     "expect.js": "~0.3.1",
-    "karma": "6.4.2",
+    "karma": "6.4.3",
     "karma-chrome-launcher": "^3.2.0",
     "karma-expect": "^1.1.3",
-    "karma-firefox-launcher": "^2.1.2",
+    "karma-firefox-launcher": "^2.1.3",
     "karma-ie-launcher": "^1.0.0",
     "karma-mocha": "^2.0.1",
     "kill-9": "~0.4.3",
     "mocha": "^10.3.0",
     "nyc": "^15.1.0",
-    "puppeteer": "^22.1.0",
+    "puppeteer": "^22.5.0",
     "sinon": "^17.0.1",
     "supertest": "^6.3.4",
     "types.d.ts": "~0.6.21",
-    "typescript": "^5.3.3",
+    "typescript": "^5.4.2",
     "why-is-node-running": "^2.2.2"
   },
   "engines": {