backend-plus 2.7.0-beta.11 → 2.7.0-beta.12

package/for-client/my-tables.js

@@ -1740,23 +1740,23 @@ myOwn.dialogDownload = function dialogDownload(grid){
         var excelExport = function(){
             var sheet1name=grid.def.name.length>27?grid.def.name.slice(0,27)+'...':grid.def.name;
             var sheet2name=grid.def.name!=="metadata"?"metadata":"meta-data";
-            var rows=[{
-                '#worksheet':sheet1name+'b',
+            var dataSheet = {
+                name: sheet1name,
                 freezeRows: 1,
                 freezeColumns: grid.def.primaryKey?.length ?? 0,
                 autoWidthMax: 40,
-            }];
-            rows=rows.concat(tableRowsXLS(grid.depotsToDisplay, fieldsDef2Export));
-            rows.push({'#worksheet':sheet2name, autoWidthMax: 40});
-            // La primera fila de metadata queda en blanco, como cuando las
-            // celdas se escribían por dirección arrancando en la fila 2.
-            rows.push([]);
-            rows.push([{v:'table',s:'header'}, grid.def.name]);
-            rows.push([{v:'date' ,s:'header'}, new Date().toISOString()]);
-            rows.push([{v:'user' ,s:'header'}, my.config.username]);
-            // grid.def.allow.forEach(function(action,iAction){
-            //     exportFileInformationWs[XLSX.utils.encode_cell({c:iAction,r:2})]={t:'s',v:action};
-            // })
+                rows: tableRowsXLS(grid.depotsToDisplay, fieldsDef2Export)
+            };
+            var metadataSheet = {
+                name:sheet2name,
+                autoWidthMax: 40,
+                rows: [
+                    [],
+                    [{v:'table',s:'header'}, grid.def.name],
+                    [{v:'date' ,s:'header'}, new Date().toISOString()],
+                    [{v:'user' ,s:'header'}, my.config.username],
+                ]
+            };
             if(grid.def.exportMetadata){
                 if(grid.def.exportMetadata.fieldProperties){
                     var fieldPropertiesDefs=grid.def.exportMetadata.fieldProperties.map(function(propName, i){
@@ -1768,11 +1768,11 @@ myOwn.dialogDownload = function dialogDownload(grid){
                         return {row:fieldDef};
                     });
                     extraColumns={};
-                    rows=rows.concat(tableRowsXLS(fieldPropertiesDepot,fieldPropertiesDefs,1));
+                    metadataSheet.rows.push(...(tableRowsXLS(fieldPropertiesDepot,fieldPropertiesDefs,1)));
                 }
             }
             xlsxNowBrowser.createXlsxBlob({
-                rows,
+                sheets: [dataSheet, metadataSheet],
                 styles:XLSX_STYLES
             }).then(function(blob){
                 mainDiv.setAttribute("current-state", "ready");

package/lib/backend-plus.js

@@ -63,7 +63,37 @@ var myOwn = require('../for-client/my-things.js');
 
 var typeStore = require('type-store');
 var json4all = require('json4all');
-var XLSX = require('xlsx');
+var xlsxNow = require('xlsx-now/node');
+var xlsxNowCore = require('xlsx-now');
+var Big = require('big.js');
+
+// Los tipos que las queries devuelven y no son valores nativos de una celda.
+// Sin esto xlsx-now los rechaza, porque un objeto que nadie reclama no tiene
+// una única forma correcta de escribirse.
+var xlsxTypes = xlsxNowCore.defaultTypes;
+// Un timestamp es una fecha: se escribe como tal y no como texto.
+xlsxTypes = xlsxNowCore.withType(xlsxTypes, bestGlobals.Datetime, {
+    convert: (value, context) => xlsxNowCore.dateValue(new Date(value.getTime()), context)
+});
+// Igual que en la exportación del cliente: días, con formato de duración.
+xlsxTypes = xlsxNowCore.withType(xlsxTypes, bestGlobals.TimeInterval, {
+    convert: (value) => ({v:value.timeInterval.ms?value.timeInterval.ms/(1000*60*60*24):null, numFmt:'[h]:mm:ss'})
+});
+// decimal y hugeint. Como texto cuando el double ya no los representa exacto,
+// para no devolver un número redondeado con apariencia de exacto.
+xlsxTypes = xlsxNowCore.withType(xlsxTypes, Big, {
+    convert: function(value){
+        var text = value.toString();
+        var asNumber = Number(text);
+        return Number.isSafeInteger(asNumber) || String(asNumber) === text
+            ? {v:asNumber}
+            : {v:text, t:'inlineStr'};
+    }
+});
+// jsonb, jsona, gpoint, point y cualquier otro objeto sin tipo propio.
+xlsxTypes = xlsxNowCore.withType(xlsxTypes, Object, {
+    convert: (value) => ({v:JSON.stringify(value), t:'inlineStr'})
+});
 
 var loginPlus = require('login-plus');
 var dashDashDir=Array.prototype.indexOf.call(process.argv,'--dir')
@@ -3822,21 +3852,16 @@ AppBackend.prototype.exportacionesGenerico = async function exportacionesGeneric
     }
     if(fileName){
         context.informProgress({message:'armando XLSX'})
-        var wb = XLSX.utils.book_new();
-        result.map(({title, rows})=>{
+        var sheets = result.map(({title, rows})=>{
             var rowsA = rows.map(row=>Object.values(row));
             if(rows[0]){
-                rowsA.unshift(Object.keys(rows[0]));
+                rowsA.unshift({'#line': 'array', values:Object.keys(rows[0]), s: {bold: true}});
             }
-            var ws = XLSX.utils.aoa_to_sheet(rowsA);
-            XLSX.utils.book_append_sheet(wb, ws, title);
-            return ws;
+            return {name:title, rows:rowsA};
         })
         context.informProgress({message:`guardando XLSX: ${fileName}`})
         await bestGlobals.sleep(100);
-        await new Promise((resolve,reject)=>XLSX.writeFileAsync(`dist/client/${fileName}`,wb,{},
-            (err)=>err?reject(err):resolve()
-        ))
+        await xlsxNow.writeXlsxFile(`dist/client/${fileName}`, {sheets, types:xlsxTypes, autoWidthMax:50, freezeRows:1});
     }
     return [
         ...(fileName?[{url:fileName, label:csvFileName?'xlsx de control':fileName}]:[]),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for the anti Pareto rule",
-  "version": "2.7.0-beta.11",
+  "version": "2.7.0-beta.12",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -76,7 +76,7 @@
     "type-store": "^0.6.0",
     "typed-controls": "^0.12.7",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz",
-    "xlsx-now": "^0.1.6"
+    "xlsx-now": "^0.2.1"
   },
   "devDependencies": {
     "@types/big.js": "^7.0.0",