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

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;
         }
     })

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.28",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",