backend-plus 2.0.0-rc.9 → 2.0.2

package/for-client/css/my-menu.styl

@@ -161,5 +161,9 @@ a.disabled
       font-size 80%
       text-align right
       color #777
+    > .json-container
+      position sticky
+      top 5%
+      bottom 5%
 
 

package/for-client/my-localdb.js

@@ -8,8 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");

package/for-client/my-menu.js

@@ -291,9 +291,11 @@ myOwn.showPage = function showPage(pageDef){
         rightMenu.style.zIndex=300;
         totalLayout.appendChild(rightMenu);
     }
-    rightMenu.onclick=function(){
-        if(!my.offline.mode){
-            my.rightMenu();
+    if (rightMenu != null) {
+        rightMenu.onclick=function(){
+            if(!my.offline.mode){
+                my.rightMenu();
+            }
         }
     }
 };
@@ -539,9 +541,9 @@ myOwn.informDetectedStatus = function informDetectedStatus(statusCode, logged) {
     }
     if(statusCode==='notLogged'){
         var notLogged = document.getElementById('not-logged');
-        notLogged.style.display='inherit';
+        if (notLogged) notLogged.style.display='inherit';
         var activeUser = document.getElementById('active-user');
-        activeUser.style.display='none';
+        if (activeUser) activeUser.style.display='none';
     }
 }
 
@@ -558,11 +560,13 @@ myOwn.offlineModeRefresh = function offlineModeRefresh(){
     /** @type {HTMLImageElement} */
     // @ts-ignore
     var imgLight = document.getElementById('light-airplane');
-    var skin=((my.config||{}).config||{}).skin;
-    if(my.offline.mode){
-        imgLight.src=my.path.img+'airplane-on.png';
-    }else{
-        imgLight.src=my.path.img+'airplane-off.png';
+    if (imgLight != null) {
+        var skin=((my.config||{}).config||{}).skin;
+        if(my.offline.mode){
+            imgLight.src=my.path.img+'airplane-on.png';
+        }else{
+            imgLight.src=my.path.img+'airplane-off.png';
+        }
     }
 }
 

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/for-client/my-websqldb.js

@@ -8,8 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");

package/lib/backend-plus.d.ts

@@ -12,9 +12,7 @@ export type LangId = 'en'|'es'|'etc...';
 
 export type Server=net.Server;
 
-export interface CoreFunctionParameters{
-    [key:string]: any
-}
+export type CoreFunctionParameters<T extends Record<string, any>> = T;
 
 export type MarkdownDoc = 'markdown documentation with `` can content newlines. The identation of the first line is deleted in all others'|'etc...'; 
 
@@ -34,14 +32,14 @@ export type UploadedFileInfo={
     path: string
 
 }
-export type CoreFunction = ((context: ProcedureContext, parameters: CoreFunctionParameters) => Promise<any>)
-                            | ((context: ProcedureContext, parameters: CoreFunctionParameters, files?:UploadedFileInfo[]) => Promise<any>);
+export type CoreFunction<T> = ((context: ProcedureContext, parameters: CoreFunctionParameters<T>) => Promise<any>)
+                            | ((context: ProcedureContext, parameters: CoreFunctionParameters<T>, files?:UploadedFileInfo[]) => Promise<any>);
 
-export interface ProcedureDef {
+export interface ProcedureDef<T = any> {
     action: string
     parameters: ProcedureParameter[]
     method?: 'get'|'post'
-    coreFunction: CoreFunction 
+    coreFunction: CoreFunction<T> 
     encoding?:'JSON4all'|'JSON'|'download'
     multipart?:true
     progress?:true
@@ -78,7 +76,7 @@ export interface ContextForDump extends Context {
     forDump?:boolean
 }
 
-export type InformProgressFunction=(opts:Error|{data:any}|{start:any}|{message:string}|{message?:string, lengthComputable:boolean, loaded:number, total:number, force?:boolean})=>void
+export type InformProgressFunction=(opts:Error|{data:any}|{start:any}|{message:string}|{idGroup?:string, message?:string, lengthComputable:boolean, loaded:number, total:number, force?:boolean})=>void
 
 export interface ProcedureContext extends Context{
     client:Client
@@ -93,6 +91,11 @@ export interface Request extends express.Request {
     user?:User
     session:express.Request["session"]
 }
+export interface RequestDb {
+    user?:User
+    machineId?:string
+    userAgent?:{shortDescription?:string}
+}
 export {Response, Express} from "express";
 export interface ResponsePlus extends express.Response{}
 export interface ExpressPlus extends express.Express{}
@@ -136,7 +139,7 @@ export type MenuInfoPath={
     path:string
 } & MenuInfoMinimo;
 export interface ClientModuleDefinition{
-    type:'js'|'css'|'ttf'
+    type:'js'|'css'|'ttf'|'mjs'
     module?:string // module where to search in node_modules (node_modules/module/modPath/file) to serve
     modPath?:string // path inside module where to find file to serve
     src?:string  // full path where browser search file (path/file)
@@ -163,7 +166,7 @@ export interface TableContext extends Context{
     superuser?:true
     forDump?:boolean
 }
-export type PgKnownTypes='decimal'|'text'|'boolean'|'integer'|'bigint'|'date'|'interval'|'timestamp'|'jsonb'|'double'|'bytea'|'jsona';
+export type PgKnownTypes='decimal'|'text'|'boolean'|'integer'|'bigint'|'date'|'interval'|'timestamp'|'jsonb'|'double'|'bytea'|'jsona'|'time'|'tsrange'|'time_range';
 export type PgKnownDbValues='current_timestamp'|'current_user'|'session_user';
 export type SequenceDefinition = {
     name:string
@@ -171,6 +174,7 @@ export type SequenceDefinition = {
     prefix?:string /* Prefix for the generated value */
 }
 export type ExportMetadataDefinition={ /* TODO: define */ }
+export type PostInputOptions='upperSpanish' | 'upperWithoutDiacritics' | 'parseDecimal'
 export type FieldDefinition = EditableDbDefinition & {
     name:string
     typeName:PgKnownTypes|'ARRAY:text'
@@ -186,7 +190,7 @@ export type FieldDefinition = EditableDbDefinition & {
     serverSide?:boolean        /* default:!clientSide if the value is retrived from the database */
     inTable?:boolean           /* default:!clientSide && !sql.fields[...].expr. Is a real fisical field in the table */
     /* sizeByte?:number  deprecated size in bytes for numbers */
-    allowEmtpyText?:boolean    /* if a text field accepts '' as a valid value */
+    allowEmptyText?:boolean    /* if a text field accepts '' as a valid value */
     mobileInputType?:string     
     extraRow?:number
     inexactNumber?:number      /* default:depends on typeName  if = means abs(x-v)<espilon
@@ -212,6 +216,8 @@ export type FieldDefinition = EditableDbDefinition & {
     inherited?:boolean
     nameForUpsert?:string
     alwaysShow?:boolean /* show when appears in fixed fields */
+    suggestingKeys?:string[]
+    postInput?:PostInputOptions
 } & ({} | {
     sequence:SequenceDefinition
     nullable:true
@@ -250,7 +256,8 @@ export type ForeignKey = {
 }
 export type Constraint = {constraintType:string, consName?:string} & (
     {constraintType:'unique', fields:string[], where?:string} |
-    {constraintType:'check', expr?:string} 
+    {constraintType:'check', expr?:string} |
+    {constraintType:'exclude', using:'GIST', fields:(string|{fieldName:string, operator:'='|'&&'})[]}
 )
 export type OtherTableDefs = Record<string,Partial<TableDefinition & {prefilledField:Record<string,any>}>>
 export type TableDefinition = EditableDbDefinition & {
@@ -259,16 +266,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
@@ -277,11 +285,12 @@ export type TableDefinition = EditableDbDefinition & {
             fieldName:string
         }
         tableName?:string
+        tableName4Delete?:string
         fields?:{
             [k:string]:{
                 expr:string
             }
-        },
+        }
         orderBy?:string[]
         viewBody?:string
         insertIfNotUpdate?:boolean
@@ -295,6 +304,7 @@ export type TableDefinition = EditableDbDefinition & {
         join?:string
         constraintsDeferred?:boolean
         otherTableDefs?:OtherTableDefs
+        setExpectedPkValues?:boolean
     }
     foreignKeys?:ForeignKey[]
     softForeignKeys?:ForeignKey[]
@@ -320,7 +330,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 }
@@ -365,6 +375,129 @@ export interface Caches {
     procedures:Record<string, {timestamp:number, result:any}>
 }
 
+export interface AppConfigBin {                                    // executables in SO
+    "zip-password-parameter-flag": string // parameter to pass the password to the zipper
+    "zip-password-prefix": string         // password prefix
+    "zip-fixed-parameters":string         // fixed parameters to pass to zipper
+}
+
+export interface AppConfig {
+    package: {
+        version: string
+    }
+    server: {
+        "base-url": string                 // rool path in the url
+        port: number                       // port of the API services
+        "session-store": string            // strategies to store session info
+        "ip-replacer": string              // ip that can be not showed or deduced in logs
+        "silent-startup": boolean          // less logs when startup
+        "kill-9": string                   // a way to kill from URL with a token
+        bitacoraSchema: string
+        bitacoraTableName: string 
+    }
+    db: {
+        motor: 'postgresql'
+        database: string
+        user: string
+        password: string
+        schema: string
+        search_path: string
+        tablespace: string                 // for creation scripts
+        "min-version": string              // min version of the motor needed
+        nodb: boolean                      // if there is no database needed in the app
+        no_login: boolean                  // if no login is needed. Used only for all public sites
+        "downloadable-backup-path": string // OS path of the encrypted downloadable backup
+    }
+    login: {
+        schema: string                     // schema of the user table
+        table: string                      // user table
+        userFieldname: string              // fieldname in user table that stores the user name
+        passFieldname: string              // fieldname in user table that stores the password hash
+        rolFieldname: string               // fieldname in user table that stores the rol
+        unloggedLandPage: string           // land page when there is no user logged when the backend has public services
+        noLoggedUrlPath: string            // path of non logged users when the backend has no public services
+        "preserve-case": boolean           // preserve the case of the user name
+        activeClausule: string             // SQL expression over the user table to check if a user is active
+        lockedClausule: string             // SQL expression over the user table to check if a user is locked
+        disableChangePassword: boolean     // disallow password change
+        skipBitacora: boolean              // don't register logins
+        keepAlive: number                  // secs to keep alive a session if only keep alive request where received
+        plus: {
+            userFieldName:string
+            store:{
+                module: string
+            }
+        }
+        forget: {                          // forget password configurations:
+            urlPath: string                // url sent by mail. default: `/new-pass`
+            urlPathOk: string              // confirmation page
+            mailFields: string[]           // fields for the forget pass mail
+
+        }
+        "double-dragon": boolean           // app user must match db user
+    }
+    install: {
+        "table-data-dir": string           // SO path to the .tab files in the db creation script
+        dump: {                            // configuration of --dump-db, the db creation script
+            "drop-his": boolean            // include drop schema his in the db creation script
+            db: {                          
+                owner: string              
+                extensions: string[]       // extensions to be installed (gist, pg_trgm, pgcrypto)
+                enances: 'file'            // if the enances must be dumped in a separate file
+                // from here info to set the owner and replace owner and user used in devel when script creation
+                "owner4special-scripts": string
+                "user4special-scripts": string
+                "apply-generic-user-replaces": string
+            }
+            "admin-can-create-tables": boolean // for apps that allows the user to create tables
+            "skip-content": boolean        // don't create data from "table-data-dir"
+            folders: string                //
+            scripts: {
+                prepare: string            // SO path to the prepare scripts that will be run before the functions creations and inserts
+                "post-adapt": string       // SO path to the post-adapt scripts that will be run after data inserts (of .tab tables)
+            }
+        }
+    }
+    "client-setup": {                      // front-end config
+        title:string                       // title of the app (common sufix of the title bar)
+    }
+    log: {
+        "serve-content": never
+        req: {
+            "keep-alive": boolean
+        }
+        db: {
+            "last-error": boolean          // store last db error in a log file
+            devel: boolean                 //
+            "on-demand": string            // if log db level can be changed on the fly
+            until: string | Date           // full log until...
+            results: boolean               // if query results must be included in full db logs
+        }
+        session: boolean                   // if all session activity must be logged
+    }
+    devel: {
+        delay: number                      // msec avg random delay in API responses (to emulate slow nets)
+        "cache-content": boolean           // if the cache header must be sent to the client (when no devel config the default is true)
+        forceShowAsEditable: boolean       // force "editable" behavior in grids 
+    }
+    mailer: {                              // config to send mails
+        conn: string                       // connection string
+        "mail-info": {}                    // static mail config
+        supervise: {
+            to: string                     // email addres of the supervisor
+            event: {
+            }
+        }
+    }
+    bin: AppConfigBin 
+    data: {
+        transformers: {
+            text: string                   // define the inputTransformers for text comming from the fron-end via the API
+        }
+    }
+    skipUnknownFieldsAtImport: boolean     // if unknown fields must be skipped by default in import
+}
+
 export class AppBackend{
     procedures:ProcedureDef[]
     procedure:{ [key:string]:ProcedureDef }
@@ -372,7 +505,7 @@ export class AppBackend{
     getTableDefinition: TableDefinitionsGetters
     tableStructures: TableDefinitions
     db: MotorDb
-    config: any
+    config: AppConfig
     rootPath: string
     caches:Caches
     fieldDomain:{[k:string]:Partial<FieldDefinition>}
@@ -398,10 +531,10 @@ export class AppBackend{
     isAdmin():boolean
     canChangePass():Promise<boolean>
     getMenu(context?:Context):MenuDefinition
-    inDbClient<T>(req:Request|null, doThisWithDbClient:(client:Client)=>Promise<T>):Promise<T>
-    inTransaction<T>(req:Request|null, doThisWithDbTransaction:(client:Client)=>Promise<T>):Promise<T>
+    inDbClient<T>(req:RequestDb|null, doThisWithDbClient:(client:Client)=>Promise<T>):Promise<T>
+    inTransaction<T>(req:RequestDb|null, doThisWithDbTransaction:(client:Client)=>Promise<T>):Promise<T>
     inTransactionProcedureContext<T>(req:Request|null, coreFunction:(context:ProcedureContext)=>Promise<T>):Promise<T>
-    procedureDefCompleter(procedureDef:ProcedureDef):ProcedureDef
+    procedureDefCompleter<T>(procedureDef:ProcedureDef):ProcedureDef<T>
     tableDefAdapt(tableDef:TableDefinition, context:Context):TableDefinition
     pushApp(dirname:string):void
     dumpDbTableFields(tableDefinition:TableDefinition):string[]
@@ -420,7 +553,8 @@ export class AppBackend{
     i18n:{
         messages:Record<LangId,Record<string, string>>
     }
-    shootDownBackend():Promise<void>
+    shutdownCallbackListAdd(param:{message:string, fun:()=>Promise<void>}):void
+    shutdownBackend():Promise<void>
     setLog(opts:{until:string, results?:boolean}):void
     getDataDumpTransformations(rawData:string):Promise<{rawData:string, prepareTransformationSql:string[], endTransformationSql:string[]}>
 }