backend-plus 2.0.0-rc.2 → 2.0.0-rc.4

package/for-client/my-menu.js

@@ -152,7 +152,7 @@ myOwn.wScreens.procAux = {
                 button.disabled=false;
                 divProgressOutside.style.opacity=0.33;
                 toggleProgress.disabled=false;
-                labelProgress.textContent=resultOk?my.messages.completed:'error';
+                labelProgress.textContent=typeof resultOk == "string" ? resultOk : resultOk !== false ? my.messages.completed : 'error';
             }).catch(function(err){
                 my.log(err);
                 divProgress.textContent=err.message;

package/lib/backend-plus.d.ts

@@ -35,7 +35,7 @@ export type UploadedFileInfo={
 
 }
 export type CoreFunction = ((context: ProcedureContext, parameters: CoreFunctionParameters) => Promise<any>)
-                         | ((context: ProcedureContext, parameters: CoreFunctionParameters, files?:UploadedFileInfo[]) => Promise<any>);
+                            | ((context: ProcedureContext, parameters: CoreFunctionParameters, files?:UploadedFileInfo[]) => Promise<any>);
 
 export interface ProcedureDef {
     action: string
@@ -252,6 +252,7 @@ export type Constraint = {constraintType:string, consName?:string} & (
     {constraintType:'unique', fields:string[], where?:string} |
     {constraintType:'check', expr?:string} 
 )
+export type OtherTableDefs = Record<string,Partial<TableDefinition & {prefilledField:Record<string,any>}>>
 export type TableDefinition = EditableDbDefinition & {
     name:string
     elementName?:string
@@ -293,7 +294,7 @@ export type TableDefinition = EditableDbDefinition & {
         }
         join?:string
         constraintsDeferred?:boolean
-        otherTableDefs?:Record<string,Partial<TableDefinition & {prefilledField:Record<string,any>}>>
+        otherTableDefs?:OtherTableDefs
     }
     foreignKeys?:ForeignKey[]
     softForeignKeys?:ForeignKey[]
@@ -322,7 +323,6 @@ export type TableDefinition = EditableDbDefinition & {
     filterColumns?:{column:string, operator:string, value:any}[],
     gridAlias?:string   /* front-end css my-table = gridAlias */
 }
-export type OtherTableDefs = TableDefinition['sql']['otherTableDefs']
 export interface DetailTable { table?: string, fields: FieldsForConnectDetailTable, abr: string, label?: string, refreshParent?:boolean, refreshFromParent?:boolean, wScreen?:string, condition?:string }
 export type TableDefinitionFunction = (context: ContextForDump, opts?:any) => TableDefinition;
 export type TableItemDef=string|{name:string, path?:string, tableGenerator?:(context:TableContext)=>TableDefinition}

package/lib/backend-plus.js

@@ -456,7 +456,7 @@ AppBackend.prototype.setStaticConfig = function setStaticConfig(defConfigYamlStr
 
 AppBackend.prototype.configList = function configList(){
     var list=[this.staticConfig];
-    if(!this.staticConfig["client-setup"].title && fs.existsSync(this.rootPath+'/def-config.yaml')){
+    if(!this.staticConfig["client-setup"]?.title && fs.existsSync(this.rootPath+'/def-config.yaml')){
         console.log('DEPRECATED!!!!!!')
         console.error('ERROR el def-config hay que ponerlo dentro de staticConfig');
         console.log('DEPRECATED!!!!!!')
@@ -466,7 +466,7 @@ AppBackend.prototype.configList = function configList(){
         list.push(this.rootPath+'/def-config.yaml')
     };
     list.push(this.rootPath+'/local-config');
-    list.push(process.env.BACKEND_PLUS_LOCAL_CONFIG||{});
+    list.push(process.env.BACKEND_PLUS_LOCAL_CONFIG?.trim()||{});
     return list;
 };
 
@@ -1130,7 +1130,7 @@ AppBackend.prototype.start = function start(opts){
         }
         return be.sendMail({
             to: be.config.mailer?.supervise?.to,
-            subject: `npm start ${be.config["client-setup"].title || packagejson.name} ok ✔️`,
+            subject: `npm start ${be.config["client-setup"]?.title || packagejson.name} ok ✔️`,
             text:`Inicio del servicio: ${new Date().toJSON()}
             
             Contexto: ${os.userInfo().username} ${process.cwd()}
@@ -1152,7 +1152,7 @@ AppBackend.prototype.start = function start(opts){
         }
         var mailDeAvisoDeFalla = be.sendMail({
             to: be.config.mailer?.supervise?.to,
-            subject: `npm start ${be.config["client-setup"].title || packagejson.name} fallido 🛑`,
+            subject: `npm start ${be.config["client-setup"]?.title || packagejson.name} fallido 🛑`,
             text:`Falla en el inicio del servicio: ${new Date().toJSON()}
             
             Contexto: ${os.userInfo().username} ${process.cwd()}
@@ -2181,7 +2181,7 @@ AppBackend.prototype.mainPage = function mainPage(req, offlineMode, opts){
     }
     return html.html(attr,[
         html.head([
-            html.title(be.config["client-setup"].title),
+            html.title(be.config["client-setup"]?.title),
             html.meta({charset:"utf-8"}),
             viewportAttrs?html.meta(viewportAttrs):null,
             html.link({href: opts.icons.iconShortcut , rel: "shortcut icon", type: "image/png"}),
@@ -2847,7 +2847,7 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
             allTableData = allTableContent.slice(startIndex, lastIndex);
         } catch(err) {
             if (err.code != 'ENOENT') throw err;
-            throw err;
+            //throw err;
         }
     }
     if (allTableData) {
@@ -2965,20 +2965,29 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
             console.log('silence "skipping content" messages in "local-config.yaml".install.dump.skip-content=true');
         }
     }
+    let installFolders = be.config.install.dump.folders ?? ['install']
     let texts = await Promise.all(
         ['prepare.sql','pre-adapt.sql','adapt.sql']
         .concat(be.config.install.dump.scripts['prepare'])
         .concat(be.config.install.dump.scripts['post-adapt'])
-        .map(function(fileName){
-            return fs.readFile(be.rootPath+'/install/'+fileName, {encoding:'UTF8'}).catch(function(err){
-                if(err.code!='ENOENT'){
-                    throw err;
+        .map(async function(fileName){
+            if (!fileName) return '';
+            var i = 0; 
+            var content;
+            do {
+                var folder = installFolders[i];
+                try{
+                    content = await fs.readFile(be.rootPath+'/'+folder+'/'+fileName, {encoding:'UTF8'});
+                } catch (err) {
+                    if(err.code!='ENOENT') throw err;
                 }
-                console.log("err:",err);
+                i++;
+            } while (i < installFolders.length && !content);
+            if (!content) {
                 return '-- no '+fileName+'\n';
-            }).then(function(content){
-                return '-- '+fileName+'\n'+content;
-            });
+            } else {
+                return '-- '+folder+'/'+fileName+'\n'+content;
+            };
         })
     );
     var prepareList=(be.config.install.dump.scripts['prepare']||[]);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for the anti Pareto rule",
-  "version": "2.0.0-rc.2",
+  "version": "2.0.0-rc.4",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -41,7 +41,7 @@
     "dialog-promise": "^0.9.15",
     "discrepances": "^0.2.8",
     "express": "^4.18.2",
-    "express-session": "^1.17.3",
+    "express-session": "^1.18.0",
     "express-useragent": "^1.0.15",
     "fs-extra": "^11.2.0",
     "js-to-html": "^1.3.2",
@@ -54,7 +54,7 @@
     "mini-tools": "^1.12.1",
     "moment": "^2.30.1",
     "multiparty": "^4.2.3",
-    "nodemailer": "^6.9.8",
+    "nodemailer": "^6.9.9",
     "numeral": "^2.0.6",
     "pg-promise-strict": "^1.3.3",
     "pikaday": "^1.8.2",
@@ -81,7 +81,7 @@
     "@types/js-yaml": "^4.0.9",
     "@types/mocha": "^10.0.6",
     "@types/multiparty": "~0.0.36",
-    "@types/node": "^20.11.9",
+    "@types/node": "^20.11.17",
     "@types/nodemailer": "^6.4.14",
     "@types/numeral": "~2.0.5",
     "@types/session-file-store": "^1.2.5",
@@ -96,9 +96,9 @@
     "karma-ie-launcher": "^1.0.0",
     "karma-mocha": "^2.0.1",
     "kill-9": "~0.4.3",
-    "mocha": "^10.2.0",
+    "mocha": "^10.3.0",
     "nyc": "^15.1.0",
-    "puppeteer": "^21.9.0",
+    "puppeteer": "^22.0.0",
     "sinon": "^17.0.1",
     "supertest": "^6.3.4",
     "types.d.ts": "~0.6.21",