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

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');
@@ -78,13 +78,14 @@ ProcedureTables = [
             {name: 'table', encoding:'plain'},
             {name: 'fixedFields', defaultValue:[]},
             {name: 'paramfun', defaultValue:[]},
-            {name: 'pick', defaultValue:'', encoding:'plain'}
+            {name: 'pick', defaultValue:'', encoding:'plain'},
+            {name: 'retrieveIgnoringWhere', defaultValue:false}
         ],
         coreFunction:
         /**
         * 
         * @param {*} context 
-        * @param {{table:string, fixedFields:{fieldName:string, value:any, range:string}[], paramfun:string[], pick:string}} parameters 
+        * @param {{table:string, fixedFields:{fieldName:string, value:any, range:string}[], paramfun:string[], pick:string, retrieveIgnoringWhere:boolean}} parameters * @param {{table:string, fixedFields:{fieldName:string, value:any, range:string}[], paramfun:string[], pick:string}} parameters 
         */
         async function tableDatum(context, parameters){
             var be=context.be;
@@ -148,7 +149,7 @@ ProcedureTables = [
             /** @type {string} */
             var sql="SELECT "+[...defTable.sql.select].join(', ')+
                 "\n FROM "+defTable.sql.from+
-                "\n WHERE "+(defTable.sql.where||(defTable.allow.select && !defTable.forInsertOnlyMode?'true':'false'))+fixedClausule.join("")+
+                "\n WHERE "+((parameters.retrieveIgnoringWhere?'true':defTable.sql.where)||(defTable.allow.select && !defTable.forInsertOnlyMode?'true':'false'))+fixedClausule.join("")+
                 // " ORDER BY "+defTable.primaryKey.map(be.db.quoteIdent.bind(be.db)).join(',')
                 "\n ORDER BY "+(defTable.sql.orderBy||defTable.primaryKey).map(function(fieldName){ return be.db.quoteIdent(fieldName); }).join(',')
             if(specialFixedClause.length){
@@ -200,7 +201,7 @@ ProcedureTables = [
                 tables:{},
                 tableNames:{}
             };
-            var expectedMainPrimaryKeyValues=parameters.primaryKeyValues;
+            var expectedMainPrimaryKeyValues = parameters.primaryKeyValues;
             /** @type { TableUpdater } */
             // @ts-expect-error parece no asignada pero al menos un nombre hay en el ciclo y por lo tanto va a tener valor
             var updateTarget = {}
@@ -256,6 +257,7 @@ ProcedureTables = [
             });
             var result;
             var mainResult;
+            var initialUpdatesLength = updates.length;
             while(updates.length){
                 var {fieldNames, values, defTable, main} = notnull(updates.shift());
                 var values4Insert = values.slice(0);
@@ -271,7 +273,7 @@ ProcedureTables = [
                             values4Insert[i] = value;
                         }
                     }
-                    if(defField.generatedAs){
+                    if(defField.generatedAs || defField.inTable === false){
                         var i = fieldNames4Insert.indexOf(defField.name);
                         if(i!==-1){
                             fieldNames4Insert.splice(i,1);
@@ -283,10 +285,11 @@ ProcedureTables = [
                 var primaryKeyValues=[]
                 var primaryKeyValuesForUpdate=[]
                 var primaryKeyValueObject={};
+                var fieldNames4InsertWithoutPkAddings = fieldNames4Insert.slice(0);
                 defTable.primaryKey.forEach(function(name,i){
                     var value = main?parameters.primaryKeyValues[i]:coalesce(parameters.newRow[name],parameters.oldRow[name],undefined);
+                    var defField = defTable.field[name];
                     if(value===undefined){
-                        var defField = defTable.field[name];
                         value = defTable.prefilledField && name in defTable.prefilledField ? defTable.prefilledField[name] : (
                             'defaultValue' in defField?defField.defaultValue:(
                             'specialDefaultValue' in defField?new Error("my.specialDefaultValue[defField.specialDefaultValue](name, {row:{}}, {row:previousRow})"):undefined
@@ -303,13 +306,16 @@ ProcedureTables = [
                     }else{
                         primaryKeyValuesForUpdate[i]=value;
                     }
-                    if(!fieldNames4Insert.includes(name) && value != null){
+                    if(!fieldNames4Insert.includes(name) && value != null && defField.inTable !== false){
                         fieldNames4Insert.push(name); 
                         values4Insert.push(value);
                     }
                 });
-                if(main){
-                    expectedMainPrimaryKeyValues=primaryKeyValues;
+                if (main) {
+                    expectedMainPrimaryKeyValues = primaryKeyValues;
+                } else if (defTable.sql.setExpectedPkValues) {
+                    expectedMainPrimaryKeyValues = primaryKeyValues.slice(0);
+                    while (expectedMainPrimaryKeyValues.length < mainDefTable.primaryKey.length) expectedMainPrimaryKeyValues.push(null);
                 }
                 var returningClausule='';
                 if(opts && opts.forImport){
@@ -330,7 +336,9 @@ ProcedureTables = [
                     return result;
                 }
                 var sql;
-                if(defTable && parameters.status=='new'){
+                if (defTable?.sql?.isTable === false && initialUpdatesLength > 1 && fieldNames4InsertWithoutPkAddings.length == 0) {
+                    // New feature. Ignore attempts to save to non tables when pseudo tables save in others
+                } else if(defTable && parameters.status=='new'){
                     result = await insertFun();
                 }else if(defTable && primaryKeyValues.length==defTable.primaryKey.length){
                     var values4Update = [];
@@ -399,6 +407,12 @@ ProcedureTables = [
                 var rowFrom = parameters.status!='new' && !plainUpdate.values.length?
                     likeAr.toPlainObject(mainDefTable.primaryKey,expectedMainPrimaryKeyValues):
                     (mainResult||result).row;
+                for (var fieldname of mainDefTable.primaryKey) {
+                    if (rowFrom[fieldname] == null) {
+                        var newValue = parameters.newRow[fieldname] ?? parameters.oldRow[fieldname];
+                        if (newValue != null) rowFrom[fieldname] = newValue
+                    }
+                }
                 result = await be.queryValuesOfUniqueRow(context, mainDefTable, rowFrom);
             }
             return {command:insertOrUpdate, row:result.row};
@@ -416,16 +430,26 @@ ProcedureTables = [
             if(!defTable.allow.delete){
                 throw changing(new Error("Deletes not allowed"),{status:403});
             }
-            var primaryKeyFields=defTable.primaryKey4Delete||defTable.primaryKey;
-            var primaryKeyValues=parameters.primaryKeyValues;
+            if (defTable.primaryKey4Delete) {
+                console.log("DEPRECATED!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! defTable.primaryKey4Delete", defTable.name);
+            }
+            var primaryKeyFields = defTable.primaryKey4Delete ?? defTable.sql.primaryKey4Delete ?? defTable.primaryKey;
+            var primaryKeyValues = [];
+            var tableName4Delete = defTable.sql.tableName4Delete ?? defTable.sql.tableName;
+            for (var fieldName of primaryKeyFields) {
+                var pos = defTable.primaryKey.indexOf(fieldName);
+                if (pos > -1) {
+                    primaryKeyValues.push(parameters.primaryKeyValues[pos]);
+                }
+            }
             if(defTable && primaryKeyValues.length==primaryKeyFields.length){
                 var sqlDelete;
                 if(defTable.sql.logicalDeletes){
-                    sqlDelete="UPDATE "+be.db.quoteIdent(defTable.sql.tableName)+
+                    sqlDelete="UPDATE "+be.db.quoteIdent(tableName4Delete)+
                     " SET "+be.db.quoteIdent(defTable.sql.logicalDeletes.fieldName)+
                     " = "+be.db.quoteNullable(defTable.sql.logicalDeletes.valueToDelete);
                 }else{
-                    sqlDelete="DELETE FROM "+be.db.quoteIdent(defTable.sql.tableName);
+                    sqlDelete="DELETE FROM "+be.db.quoteIdent(tableName4Delete);
                 }
                 sqlDelete+=" WHERE "+primaryKeyFields.map(function(fieldName, i){
                     return be.db.quoteIdent(fieldName)+" = $"+(i+1);
@@ -452,6 +476,7 @@ ProcedureTables = [
             context.informProgress({message:be.messages.server.deleting})
             var be=context.be;
             var defTable=be.tableStructures[parameters.table](context);
+            var tableName4Delete = defTable.sql.tableName4Delete ?? defTable.sql.tableName;
             if(!defTable.allow.delete && !defTable.allow.deleteAll){
                 throw changing(new Error("Deletes not allowed"),{status:403});
             }
@@ -479,7 +504,7 @@ ProcedureTables = [
                     }
                 });
                 return context.client.query(
-                    "DELETE FROM "+be.db.quoteIdent(defTable.sql.tableName)+
+                    "DELETE FROM "+be.db.quoteIdent(tableName4Delete)+
                     " WHERE "+whereParts.join(" AND ")+" RETURNING 1",
                     dataParams
                 ).fetchUniqueRow().then(function(){
@@ -489,7 +514,7 @@ ProcedureTables = [
             };
             var result = await Promise.all(parameters.rowsToDelete.map(deleteOneRow)).then(function(){
                 return context.client.query(
-                    "SELECT count(*) remaining_record_count FROM "+be.db.quoteIdent(defTable.sql.tableName)
+                    "SELECT count(*) remaining_record_count FROM "+be.db.quoteIdent(tableName4Delete)
                 ).fetchUniqueRow().then(function(result){
                     context.informProgress({lengthComputable:true, loaded:deleteCounter, total:parameters.rowsToDelete.length, force:true});
                     return result.row;
@@ -692,7 +717,7 @@ ProcedureTables = [
             {name: 'replaceNewLineWithSpace'},
         ],
         files:{count:1},
-        coreFunction:async function(context, parameters, files){
+        coreFunction:async function table_upload(context, parameters, files){
             var be=context.be;
             var doing="opening file";
             var skipUnknownFieldsAtImport = coalesce(parameters.skipUnknownFieldsAtImport, be.config.skipUnknownFieldsAtImport);
@@ -804,7 +829,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);
                             }
@@ -821,6 +847,9 @@ ProcedureTables = [
                                     if(value != null && parameters.skipUnknownFieldsAtImport){
                                         value = value.replace(/(\s|\u00A0)+/g,' ').trim()
                                     }
+                                    if (value == null && field.allowEmptyText && ('nullable' in field) && !field.nullable ) {
+                                        value = ''
+                                    }
                                     newRow[field.name]=value;
                                 }
                             });
@@ -900,6 +929,9 @@ ProcedureTables = [
                                     if(Number.isNaN(value)){
                                         value=null;
                                     }
+                                    if (value == null && field.allowEmptyText && ('nullable' in field) && !field.nullable ) {
+                                        value = ''
+                                    }
                                     if(field.defaultForOtherFields){
                                         addFieldToOthers(othersArray, field, value);
                                     }else{

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for the anti Pareto rule",
-  "version": "2.0.0-rc.3",
+  "version": "2.0.0-rc.31",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -11,7 +11,8 @@
     "lib",
     "for-client",
     "unlogged",
-    "src"
+    "src",
+    "install"
   ],
   "contributors": [
     {
@@ -29,48 +30,48 @@
   ],
   "dependencies": {
     "@upgraded/locate-path": "^6.0.0-alfa.1",
-    "ajax-best-promise": "^0.4.0",
+    "ajax-best-promise": "^0.4.2",
     "backend-skins": "^0.1.15",
-    "best-globals": "^1.1.2",
-    "big.js": "^6.2.1",
-    "body-parser": "^1.20.2",
-    "cast-error": "^0.1.0",
-    "castellano": "^0.1.3",
-    "connect-pg-simple": "^9.0.1",
+    "best-globals": "^1.1.6",
+    "big.js": "^6.2.2",
+    "body-parser": "^1.20.3",
+    "cast-error": "^0.1.1",
+    "castellano": "^0.1.4",
+    "connect-pg-simple": "^10.0.0",
     "cookie-parser": "^1.4.6",
-    "dialog-promise": "^0.9.15",
+    "dialog-promise": "^0.10.0",
     "discrepances": "^0.2.8",
-    "express": "^4.18.2",
-    "express-session": "^1.17.3",
+    "express": "^4.21.0",
+    "express-session": "^1.18.0",
     "express-useragent": "^1.0.15",
     "fs-extra": "^11.2.0",
     "js-to-html": "^1.3.2",
     "js-yaml": "^4.1.0",
-    "json4all": "^1.3.0-beta.1",
+    "json4all": "^1.4.0",
     "lazy-some": "^0.1.0",
-    "like-ar": "^0.3.9",
+    "like-ar": "^0.5.1",
     "login-plus": "^1.7.1",
     "memorystore": "^1.6.7",
-    "mini-tools": "^1.12.1",
+    "mini-tools": "^1.12.2",
     "moment": "^2.30.1",
     "multiparty": "^4.2.3",
-    "nodemailer": "^6.9.8",
+    "nodemailer": "^6.9.15",
     "numeral": "^2.0.6",
-    "pg-promise-strict": "^1.3.3",
+    "pg-promise-strict": "^1.4.1",
     "pikaday": "^1.8.2",
-    "pug": "^3.0.2",
+    "pug": "^3.0.3",
     "read-yaml-promise": "^1.0.2",
     "regexplicit": "^0.1.3",
     "require-bro": "^0.3.1",
-    "self-explain": "^0.10.22",
-    "serve-content": "^0.3.19",
+    "self-explain": "^0.11.0",
+    "serve-content": "^0.3.20",
     "session-file-store": "^1.5.0",
     "sql-tools": "^0.1.2",
     "stack-trace": "^0.0.10",
-    "stylus": "0.62.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"
+    "stylus": "0.63.0",
+    "type-store": "^0.4.2",
+    "typed-controls": "^0.12.1",
+    "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz"
   },
   "devDependencies": {
     "@types/big.js": "^6.2.2",
@@ -79,31 +80,31 @@
     "@types/express-useragent": "^1.0.5",
     "@types/fs-extra": "^11.0.4",
     "@types/js-yaml": "^4.0.9",
-    "@types/mocha": "^10.0.6",
+    "@types/mocha": "^10.0.8",
     "@types/multiparty": "~0.0.36",
-    "@types/node": "^20.11.9",
-    "@types/nodemailer": "^6.4.14",
+    "@types/node": "^22.5.5",
+    "@types/nodemailer": "^6.4.16",
     "@types/numeral": "~2.0.5",
     "@types/session-file-store": "^1.2.5",
     "@types/stack-trace": "~0.0.33",
     "@types/websql": "~0.0.30",
     "esprima": "^4.0.1",
     "expect.js": "~0.3.1",
-    "karma": "6.4.2",
+    "karma": "6.4.4",
     "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.2.0",
-    "nyc": "^15.1.0",
-    "puppeteer": "^21.9.0",
-    "sinon": "^17.0.1",
-    "supertest": "^6.3.4",
+    "mocha": "^10.7.3",
+    "nyc": "^17.1.0",
+    "puppeteer": "^23.4.0",
+    "sinon": "^19.0.2",
+    "supertest": "^7.0.0",
     "types.d.ts": "~0.6.21",
-    "typescript": "^5.3.3",
-    "why-is-node-running": "^2.2.2"
+    "typescript": "^5.6.2",
+    "why-is-node-running": "^3.2.0"
   },
   "engines": {
     "node": ">= 18"

package/unlogged/my-ajax.js

@@ -193,14 +193,17 @@ myAjax.ajaxPromise = function ajaxPromise(procedureDef,data,opts){
         }
         var result=[];
         var progress=procedureDef.progress!==false;
+        /** @type {Record<string,{ divBar, progressBar, progresIndicator, divBarLabel }>} */
+        var progressStruct = {}
         var divProgress;
-        var divBarProgress;
-        var progressBar;
-        var progressIndicator;
-        var divBarProgressLabel;
+        // var divBarProgress = {};
+        // var progressBar;
+        // var progressIndicator;
+        // var divBarProgressLabel = {};
         var onClose=function(){}
         var defaultInformProgress = function defaultInformProgress(progressInfo){
             if(progressInfo.message || progressInfo.end || progressInfo.start || progressInfo.loaded){
+                // progressInfo.idGroup
                 if(!divProgress){
                     var idAutoClose='id-auto-close-'+Math.random();
                     var checkAutoClose=html.input({type:'checkbox', id:idAutoClose, checked:myAjax.ajaxPromise.autoClose}).create();
@@ -235,8 +238,12 @@ myAjax.ajaxPromise = function ajaxPromise(procedureDef,data,opts){
                     }
                 }
             }
-            if(progressInfo.ephemeral && divBarProgressLabel){
-                divBarProgressLabel.textContent=progressInfo.message;
+            if (progressStruct[progressInfo.idGroup] == null) {
+                progressStruct[progressInfo.idGroup] = {}
+            }
+            var ps = progressStruct[progressInfo.idGroup];
+            if(progressInfo.ephemeral && ps.divBarLabel){
+                ps.divBarLabel.textContent = progressInfo.message;
             }else if(progressInfo.message || progressInfo.end){
                 var now=bestGlobals.datetime.now();
                 var elapsed = now.sub(tickTime);
@@ -265,23 +272,23 @@ myAjax.ajaxPromise = function ajaxPromise(procedureDef,data,opts){
                     );
                 }
             }
-            if(progressInfo.loaded){
-                if(!divBarProgress){
-                    divBarProgressLabel = html.div().create();
-                    progressIndicator=html.div({class:'indicator'},' ').create();
-                    progressBar=html.div({class:'progress-bar', style:'width:400px; height:8px;'},[progressIndicator]).create();
-                    divBarProgress = html.div([
-                        divBarProgressLabel,
-                        progressBar
+            if(progressInfo.loaded != null){
+                if(!ps.divBar){
+                    ps.divBarLabel = html.div().create();
+                    ps.progressIndicator=html.div({class:'indicator'},' ').create();
+                    ps.progressBar=html.div({class:'progress-bar', style:'width:400px; height:8px;'},[ps.progressIndicator]).create();
+                    ps.divBar = html.div([
+                        ps.divBarLabel,
+                        ps.progressBar
                     ]).create();
-                    divProgress.parentNode.insertBefore(divBarProgress, divProgress);
+                    divProgress.parentNode.insertBefore(ps.divBar, divProgress);
                 }
                 if(progressInfo.lengthComputable){
-                    progressIndicator.style.width=progressInfo.loaded*100/progressInfo.total+'%';
-                    progressIndicator.title=Math.round(progressInfo.loaded*100/progressInfo.total)+'%';
+                    ps.progressIndicator.style.width=progressInfo.loaded*100/progressInfo.total+'%';
+                    ps.progressIndicator.title=Math.round(progressInfo.loaded*100/progressInfo.total)+'%';
                 }else{
-                    progressIndicator.style.backgroundColor='#D4D';
-                    progressIndicator.title='N/D %';
+                    ps.progressIndicator.style.backgroundColor='#D4D';
+                    ps.progressIndicator.title='N/D %';
                 }
             }
         }
@@ -304,7 +311,6 @@ myAjax.ajaxPromise = function ajaxPromise(procedureDef,data,opts){
         }
         var controlLoggedIn = function controlLoggedIn(result, informNotLoggedIn){
             if(informNotLoggedIn || result && result[0]=="<" && result.match(/login/m)){
-                console.log('xxxxxxxxxxx',procedureDef.action)
                 my.informDetectedStatus('notLogged');
                 throw bestGlobals.changing(new Error(my.messages.notLogged),{displayed:true, isNotLoggedError:true});
             }
@@ -495,13 +501,27 @@ function agregar_json_default_ubicaciones(div, o, a){
     var table = div2.laTabla;
     var row = table.insertRow(-1);
     var cellName = row.insertCell(-1);
-    cellName.className='attr-name';
-    cellName.textContent = a; 
+    agregar_class_textInDiv(cellName, 'attr-name', a)
     var cell = row.insertCell(-1);
     cell.colSpan=99;
     return {title:cellName, data:cell, skip:o[a] == null}
 }
 
+/**
+ * 
+ * @param {HTMLTableDataElement} td
+ * @param {string|number} text
+ * @param {string} className
+ */
+function agregar_class_textInDiv(td, className, text){
+    var div = document.createElement('div');
+    td.className = className;
+    div.className = 'json-container';
+    div.textContent = text;
+    td.innerHTML = '';
+    td.appendChild(div);
+}
+
 /**
  * 
  * @param {HTMLElement} div 
@@ -524,9 +544,7 @@ function agregar_json(div, o, ubicaciones=agregar_json_default_ubicaciones){
                 if(o[a]!=null){
                     var row = table.insertRow(-1);
                     var cellName = row.insertCell(-1);
-                    cellName.className='row-num';
-                    // @ts-ignore numero y texto
-                    cellName.textContent = isNaN(a)?a:Number(a)+1; 
+                    agregar_class_textInDiv(cellName, 'row-num', isNaN(a)?a:Number(a)+1); 
                     agregar_json(row, o[a], function(div, _o, a){
                         // @ts-ignore sé que es Row
                         /** @type {HTMLTableRowElement} */
@@ -554,11 +572,9 @@ function agregar_json(div, o, ubicaciones=agregar_json_default_ubicaciones){
                 if(!cells.skip){
                     if(cells.title){
                         if(o instanceof Array && !isNaN(a)){
-                            cells.title.className='row-num';
-                            cells.title.textContent = Number(a) + 1; 
+                            agregar_class_textInDiv(cells.title, 'row-num', Number(a) + 1); 
                         }else{
-                            cells.title.className='attr-name';
-                            cells.title.textContent = a; 
+                            agregar_class_textInDiv(cells.title, 'attr-name', a); 
                         }
                     }
                     agregar_json(cells.data, o[a]);
@@ -566,13 +582,16 @@ function agregar_json(div, o, ubicaciones=agregar_json_default_ubicaciones){
             }
         }
     }else{
-        div.className='plain-content';
+        var textContent;
         if(typeof o == "boolean"){
-            div.textContent = o?'Sí':'No'
+            textContent = o ? 'Sí' : 'No'
         }else if(o && o instanceof Date && o.isRealDate){
-            div.textContent = o.toDmy();
+            textContent = o.toDmy();
         }else{
-            div.textContent = o.toLocaleString();
+            textContent = o.toLocaleString();
+        }
+        if (textContent) {
+            agregar_class_textInDiv(div, 'plain-content', textContent)
         }
     }
 }