backend-plus 2.0.0-rc.27 → 2.0.0-rc.29

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

@@ -32,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
@@ -528,7 +528,7 @@ export class AppBackend{
     inDbClient<T>(req:Request|null, doThisWithDbClient:(client:Client)=>Promise<T>):Promise<T>
     inTransaction<T>(req:Request|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[]

package/lib/backend-plus.js

@@ -1768,14 +1768,26 @@ function require_resolve(moduleName){
     return resolved;
 }
 
-function resolve_module_dir(moduleName,path){
+function resolve_module_dir(moduleName,path,fileToCheck){
     var baseDir;
     if(packagejson.name==moduleName){
         baseDir=Path.join(process.cwd(), packagejson.main);
     }else{
         baseDir=require_resolve(moduleName);
     }
-    return Path.join(Path.dirname(baseDir),path||'');
+    var resultDir = Path.join(Path.dirname(baseDir),path||'');
+    if (fileToCheck) {
+        fs.stat(Path.join(resultDir, fileToCheck)).then(function(status){
+            if (!status) {
+                console.error('Error resolve_module_dir in:',resultDir,'no:',fileToCheck);
+            } else if(!status.isFile()) {
+                console.error('Error resolve_module_dir in:',resultDir,',',fileToCheck,'is not a file');
+            }
+        },function(err){
+            console.error('Error resolve_module_dir in:',resultDir,'err:',err);
+        });
+    }
+    return resultDir;
 }
 
 AppBackend.prototype.optsGenericForFiles = function optsGenericForFiles(req, opts){
@@ -1982,7 +1994,7 @@ AppBackend.prototype.addUnloggedServices = function addUnloggedServices(mainApp,
                 }
             }
         } catch (error) {
-            console.error('ERROR: No se pudo servir el módulo ' + moduleDef.module);
+            console.error('ERROR: No se pudo servir el módulo', moduleDef.module);
             throw error;
         }
     })
@@ -2670,6 +2682,30 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
     }
     var schema=db.quoteIdent(be.config.db.schema);
     linesCreate.push("set role to "+owner+";");
+    linesCreate.push(`do 
+    $do$
+    declare
+      vExpectedVersion text := '${be.config.db["min-version"]}';
+      vCurrentVersion  text := (select setting from pg_settings where name = 'server_version');
+    begin
+      if jsonb('['||replace(vCurrentVersion,'.',',')||']') < jsonb('['||replace(vExpectedVersion,'.',',')||']') then
+        raise exception 'BACKEND-PLUS DUMP: Old PostrgreSQL Version % expected %', vCurrentVersion, vExpectedVersion;
+      end if;
+    end;
+    $do$;
+    `);
+    linesCreate.push(`do 
+    $do$
+    declare
+      vExpected text := 'UTF8';
+      vCurrent  text := coalesce((select setting from pg_settings where name = 'server_encoding'),'unknown');
+    begin
+      if vCurrent is distinct from vExpected then
+        raise exception 'BACKEND-PLUS DUMP: PostrgreSQL server_encoding %, expected %', vCurrent, vExpected;
+      end if;
+    end;
+    $do$;
+    `);
     linesCreate.push("drop schema if exists "+schema+' cascade;');
     if (be.config.install.dump["drop-his"]) {
         linesCreate.push("drop schema if exists his cascade;");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for the anti Pareto rule",
-  "version": "2.0.0-rc.27",
+  "version": "2.0.0-rc.29",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -49,7 +49,7 @@
     "js-yaml": "^4.1.0",
     "json4all": "^1.3.0-beta.1",
     "lazy-some": "^0.1.0",
-    "like-ar": "^0.4.1",
+    "like-ar": "^0.5.0",
     "login-plus": "^1.7.1",
     "memorystore": "^1.6.7",
     "mini-tools": "^1.12.1",
@@ -57,7 +57,7 @@
     "multiparty": "^4.2.3",
     "nodemailer": "^6.9.14",
     "numeral": "^2.0.6",
-    "pg-promise-strict": "^1.4.0",
+    "pg-promise-strict": "^1.4.1",
     "pikaday": "^1.8.2",
     "pug": "^3.0.3",
     "read-yaml-promise": "^1.0.2",
@@ -69,8 +69,8 @@
     "sql-tools": "^0.1.2",
     "stack-trace": "^0.0.10",
     "stylus": "0.63.0",
-    "type-store": "^0.4.1",
-    "typed-controls": "^0.12.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": {
@@ -82,7 +82,7 @@
     "@types/js-yaml": "^4.0.9",
     "@types/mocha": "^10.0.7",
     "@types/multiparty": "~0.0.36",
-    "@types/node": "^22.0.0",
+    "@types/node": "^22.5.2",
     "@types/nodemailer": "^6.4.15",
     "@types/numeral": "~2.0.5",
     "@types/session-file-store": "^1.2.5",
@@ -90,16 +90,16 @@
     "@types/websql": "~0.0.30",
     "esprima": "^4.0.1",
     "expect.js": "~0.3.1",
-    "karma": "6.4.3",
+    "karma": "6.4.4",
     "karma-chrome-launcher": "^3.2.0",
     "karma-expect": "^1.1.3",
     "karma-firefox-launcher": "^2.1.3",
     "karma-ie-launcher": "^1.0.0",
     "karma-mocha": "^2.0.1",
     "kill-9": "~0.4.3",
-    "mocha": "^10.7.0",
+    "mocha": "^10.7.3",
     "nyc": "^17.0.0",
-    "puppeteer": "^22.14.0",
+    "puppeteer": "^23.2.1",
     "sinon": "^18.0.0",
     "supertest": "^7.0.0",
     "types.d.ts": "~0.6.21",