backend-plus 2.0.0-rc.17 → 2.0.0-rc.19

package/for-client/my-tables.js

@@ -183,20 +183,15 @@ myOwn.i18n.messages.es=changing(myOwn.i18n.messages.es, {
 /** @param {string} text */
 function regex4search(text){
     return new RegExp(
-        text.trim().replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
+        text.toString().trim().replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
         // .replace(/"/g,"\\b")
         .replace(/[ñÑ]/g,'(?:gn|nn?i?|[ñÑ])')
-        .replace(/[cCçÇ]/g,'[cçÇ]')
-        .replace(/[áÁàÀäÄãÃ]/gi,'[AáÁàÀäÄãÃ]')
-        .replace(/[éÉèÈëË]/gi,'[EéÉèÈëË]')
-        .replace(/[íÍìÌïÏ]/gi,'[IíÍìÌïÏ]')
-        .replace(/[óÓòÒöÖõÕ]/gi,'[OóÓòÒöÖõÕ]')
-        .replace(/[úÚùÙüÜ]/gi,'[UúÚùÙüÜ]')
-        .replace(/a/gi,'[AáÁàÀäÄãÃ]')
-        .replace(/e/gi,'[EéÉèÈëË]')
-        .replace(/i/gi,'[IíÍìÌïÏ]')
-        .replace(/o/gi,'[OóÓòÒöÖõÕ]')
-        .replace(/u/gi,'[UúÚùÙüÜ]')
+        .replace(/[cCçÇ]/g,'[cCçÇ]')
+        .replace(/[AáÁàÀäÄãÃ]/gi,'[AáÁàÀäÄãÃ]')
+        .replace(/[EéÉèÈëË]/gi,'[EéÉèÈëË]')
+        .replace(/[IíÍìÌïÏ]/gi,'[IíÍìÌïÏ]')
+        .replace(/[OóÓòÒöÖõÕ]/gi,'[OóÓòÒöÖõÕ]')
+        .replace(/[UúÚùÙüÜ]/gi,'[UúÚùÙüÜ]')
         // .replace(/\s+/g,'.*\\s+.*') mas estricto, exige el espacio
         .replace(/\s+/g,'.*')
     , 'i');
@@ -212,9 +207,9 @@ myOwn.comparatorParameterNull={
     '!=\u2205':true,
 }
 myOwn.comparator={
-    '=':function(valueToCheck,condition){return valueToCheck == condition;},
-    '~':function(valueToCheck,condition){return condition==null || regex4search(condition.toString()).test(valueToCheck);},
-    '!~':function(valueToCheck,condition){return condition==null || !regex4search(condition.toString()).test(valueToCheck);},
+    '=':function(valueToCheck,condition){return sameValue(valueToCheck,condition);},
+    '~': function(valueToCheck,condition){return condition==null || condition instanceof Date ? Math.abs(condition-valueToCheck) <= 1000*60*60*24 : regex4search(condition).test(valueToCheck);},
+    '!~':function(valueToCheck,condition){return condition==null || condition instanceof Date ? Math.abs(condition-valueToCheck) >  1000*60*60*24 :!regex4search(condition).test(valueToCheck);},
     '/R/i':function(valueToCheck,condition){return condition==null || RegExp(condition,'i').test(valueToCheck);},
     '\u2205':function(valueToCheck,condition){return valueToCheck == null;},//\u2205 = conjunto vacío
     '!=\u2205':function(valueToCheck,condition){return valueToCheck != null;},//\u2205 = conjunto vacío
@@ -1005,7 +1000,7 @@ myOwn.DataColumnGrid.prototype.thFilter = function thFilter(depot, iColumn){
     var grid = this.grid;
     var fieldDef = this.fieldDef;
     var fieldName=fieldDef.name;
-    depot.rowSymbols[fieldDef.name]=depot.rowSymbols[fieldDef.name]||'~';
+    depot.rowSymbols[fieldDef.name]=depot.rowSymbols[fieldDef.name]||(fieldDef.typeName == 'text' ? '~' : '=');
     var filterImage=my.path.img+my.comparator.traductor[depot.rowSymbols[fieldDef.name]]+'.png';
     var th=html.td(this.cellAttributes({class:"autoFilter", "typed-controls-direct-input":true},{skipMandatory:true})).create();
     var symbolFilter=th;
@@ -2253,7 +2248,8 @@ myOwn.TableGrid.prototype.createRowInsertElements = function createRowInsertElem
     }
     var depotForInsert = grid.createDepotFromRow({$allow:{delete:true, update:true}}, 'new');
     grid.connector.fixedFields.forEach(function(pair){
-        if(!pair.range && grid.def.field[pair.fieldName].inTable !== false){
+        var fieldDef = grid.def.field[pair.fieldName];
+        if(!pair.range && (fieldDef.inTable !== false || fieldDef.isPk && pair.value !=null)){
             depotForInsert.row[pair.fieldName] = pair.value;
             depotForInsert.rowPendingForUpdate[pair.fieldName] = pair.value;
         }

package/for-client/my-websqldb.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="websql" />
 import { TableDefinition } from "backend-plus";
 export type Key = string[];
 type DetectFeatures = {

package/lib/backend-plus.d.ts

@@ -257,16 +257,17 @@ export type TableDefinition = EditableDbDefinition & {
     tableName?:string
     schema?:string
     title?:string
-    fields:FieldDefinition[],
-    primaryKey:string[],
-    refrescable?: boolean;
+    fields:FieldDefinition[]
+    primaryKey:string[]
+    refrescable?: boolean
     sql?:{
+        primaryKey4Delete?:string[]
         isTable?:boolean
         from?:string
         where?:string
         postCreateSqls?:string
-        skipEnance?: boolean,
-        isReferable?: boolean,
+        skipEnance?: boolean
+        isReferable?: boolean
         logicalDeletes?:{
             fieldName:string
             valueToDelete:string
@@ -275,11 +276,12 @@ export type TableDefinition = EditableDbDefinition & {
             fieldName:string
         }
         tableName?:string
+        tableName4Delete?:string
         fields?:{
             [k:string]:{
                 expr:string
             }
-        },
+        }
         orderBy?:string[]
         viewBody?:string
         insertIfNotUpdate?:boolean
@@ -293,6 +295,7 @@ export type TableDefinition = EditableDbDefinition & {
         join?:string
         constraintsDeferred?:boolean
         otherTableDefs?:OtherTableDefs
+        setExpectedPkValues?:boolean
     }
     foreignKeys?:ForeignKey[]
     softForeignKeys?:ForeignKey[]
@@ -318,7 +321,7 @@ export type TableDefinition = EditableDbDefinition & {
     specialValidator?:string
     saveAfter?:boolean
     selfRefresh?:boolean
-    filterColumns?:{column:string, operator:string, value:any}[],
+    filterColumns?:{column:string, operator:string, value:any}[]
     gridAlias?:string   /* front-end css my-table = gridAlias */
 }
 export interface DetailTable { table?: string, fields: FieldsForConnectDetailTable, abr: string, label?: string, refreshParent?:boolean, refreshFromParent?:boolean, wScreen?:string, condition?:string }

package/lib/procedures-table.js

@@ -201,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 = {}
@@ -257,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);
@@ -272,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);
@@ -284,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
@@ -304,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){
@@ -331,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 = [];
@@ -400,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};
@@ -417,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);
@@ -453,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});
             }
@@ -480,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(){
@@ -490,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;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for the anti Pareto rule",
-  "version": "2.0.0-rc.17",
+  "version": "2.0.0-rc.19",
   "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.2",
     "backend-skins": "^0.1.15",
-    "best-globals": "^1.1.4",
+    "best-globals": "^1.1.6",
     "big.js": "^6.2.1",
     "body-parser": "^1.20.2",
     "cast-error": "^0.1.1",
@@ -55,7 +55,7 @@
     "mini-tools": "^1.12.1",
     "moment": "^2.30.1",
     "multiparty": "^4.2.3",
-    "nodemailer": "^6.9.13",
+    "nodemailer": "^6.9.14",
     "numeral": "^2.0.6",
     "pg-promise-strict": "^1.4.0",
     "pikaday": "^1.8.2",
@@ -80,9 +80,9 @@
     "@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.7",
     "@types/multiparty": "~0.0.36",
-    "@types/node": "^20.14.0",
+    "@types/node": "^20.14.9",
     "@types/nodemailer": "^6.4.15",
     "@types/numeral": "~2.0.5",
     "@types/session-file-store": "^1.2.5",
@@ -97,13 +97,13 @@
     "karma-ie-launcher": "^1.0.0",
     "karma-mocha": "^2.0.1",
     "kill-9": "~0.4.3",
-    "mocha": "^10.4.0",
-    "nyc": "^15.1.0",
-    "puppeteer": "^22.10.0",
+    "mocha": "^10.5.2",
+    "nyc": "^17.0.0",
+    "puppeteer": "^22.12.1",
     "sinon": "^18.0.0",
     "supertest": "^7.0.0",
     "types.d.ts": "~0.6.21",
-    "typescript": "^5.4.5",
+    "typescript": "^5.5.2",
     "why-is-node-running": "^2.2.2"
   },
   "engines": {