backend-plus 2.7.0-beta.0 → 2.7.0-beta.2

package/for-client/my-tables.js

@@ -2266,7 +2266,9 @@ myOwn.TableGrid.prototype.createRowInsertElements = function createRowInsertElem
         }
         if(value!==null){
             depotForInsert.row[fieldDef.name] = value;
-            depotForInsert.rowPendingForUpdate[fieldDef.name] = value;
+            if (fieldDef.inTable) {
+                depotForInsert.rowPendingForUpdate[fieldDef.name] = value;
+            }
         }
     });
     //TODO: mejorar la posición dentro del splice o concluir que no sirve el splice

package/lib/backend-plus.d.ts

@@ -1,5 +1,7 @@
 declare module "backend-plus"{
 
+type RequireSome<T, K extends keyof T> = T & Required<Pick<T, K>>;
+
 import * as net from "net";
 import * as express from "express";
 import {Client} from "pg-promise-strict";
@@ -211,6 +213,7 @@ export interface FieldDefinition extends EditableDbDefinition {
     exportMetadata?:ExportMetadataDefinition 
     description?:string
     dataLength?:number
+    dataDecimals?:number
     options?:(string|{option:string|number, label:string})[]
     inView?:boolean
     sortMethod?:string
@@ -226,6 +229,11 @@ export interface FieldDefinition extends EditableDbDefinition {
     sequence?: SequenceDefinition|SequenceMadMaxDefinition
     format?: string
 }
+export type FieldDefinitionInternal = RequireSome<FieldDefinition, 'allow'> & {
+    isPk:number|null
+    tableName:string
+    table:string
+}
 export interface EditableDbDefinition {
     editable?:boolean
     allow?:{
@@ -343,8 +351,14 @@ export type TableDefinition = EditableDbDefinition & {
         parameters?:ProcedureParameter[]
     }
 }
+export type TableDefinitionInternal = RequireSome<TableDefinition, 
+    'allow'|'sql'
+> & {
+    field:Record<string, FieldDefinitionInternal>
+    otherTableDefs:Record<string, TableDefinitionInternal>
+}
 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 TableDefinitionFunction = (context: ContextForDump, opts?:any) => TableDefinitionInternal;
 export type TableItemDef=string|{name:string, path?:string, tableGenerator?:(context:TableContext)=>TableDefinition}
 // {{name: string; path?:string; fileName?: string; source?: string; tableGenerator?:()=>void; title?:string; mixin?:any[]}} TableItem
 export interface TableDefinitions {
@@ -601,6 +615,8 @@ export class AppBackend{
     setLog(opts:{until:string, results?:boolean}):void
     getDataDumpTransformations(rawData:string):Promise<{rawData:string, prepareTransformationSql:string[], endTransformationSql:string[]}>
     activeSkinFiles: Set<string>
+    /****** internals: */
+    transformInput:<T>(fieldDefinition: FieldDefinitionInternal, value:T) => T
 }
 
 }

package/lib/backend-plus.js

@@ -3036,7 +3036,9 @@ AppBackend.prototype.dumpDbTableFields = function dumpDbTableFields(tableDef, op
             }
             fields.push(
                 '  '+db.quoteIdent(fieldDef.name)+
-                ' '+(fieldDef.dataLength?(fieldType=='text'?'varchar':fieldType)+'('+fieldDef.dataLength+')':fieldType)+
+                ' '+(fieldDef.dataLength?(fieldType=='text'?'varchar':fieldType)+'('+fieldDef.dataLength+
+                    (fieldDef.dataDecimals?','+fieldDef.dataDecimals:'')
+                +')':fieldType)+
                 ( be.specialSqlDefaultExpressions[fieldDef.defaultDbValue] != null ? ' default ' + be.specialSqlDefaultExpressions[fieldDef.defaultDbValue]
                 : fieldDef.defaultDbValue != null ? ' default ' + fieldDef.defaultDbValue 
                 : be.specialSqlDefaultExpressions[fieldDef.specialDefaultValue] != null ? ' default ' + be.specialSqlDefaultExpressions[fieldDef.specialDefaultValue]

package/lib/procedures-table.js

@@ -13,6 +13,9 @@ const bestGlobals = require('best-globals');
 
 const PANIC_IMPORT = true;
 
+/** @import { TableDefinitionInternal, ProcedureContext } from './in-backend-plus' */
+
+
 var ProcedureTables;
 
 /** @type {<T>(x:T)=>NonNullable<T>} */
@@ -21,6 +24,9 @@ var notnull = x =>{
     return x;
 };
 
+/**
+ * @param {any} mmm
+ */
 function inlineLog(mmm){ console.log(mmm); return mmm; }
 
 ProcedureTables = [
@@ -189,9 +195,18 @@ ProcedureTables = [
             {name: 'oldRow'},
             {name: 'status', encoding:'plain'},
         ],
+        /**
+         * 
+         * @param {ProcedureContext} context 
+         * @param {*} parameters 
+         * @param {*} files 
+         * @param {*} opts 
+         * @returns 
+         */
         coreFunction:async function(context, parameters, files, opts){
             var be=context.be;
             var mainDefTable=be.tableStructures[parameters.table](context);
+            /** @type {'insert'|'update'} */
             var action=parameters.status=='new'?'insert':'update';
             if(!mainDefTable.allow[action] && (!opts || !opts.forImport)){
                 throw changing(new Error(action+" not allowed"),{status:403});
@@ -254,6 +269,7 @@ ProcedureTables = [
             var updates = updatesOthers.filter(u => !u.defTable.saveAfter)
                 .concat(plainUpdate.values.length?[changing({defTable:mainDefTable,main:true},plainUpdate)]:[])
                 .concat(updatesOthers.filter(u => u.defTable.saveAfter));
+            /** @type {Record<string, any>} */
             var globalPrimaryKeyValue={}
             mainDefTable.primaryKey.forEach(function(name,i){
                 globalPrimaryKeyValue[name]=parameters.primaryKeyValues[i];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for the anti Pareto rule",
-  "version": "2.7.0-beta.0",
+  "version": "2.7.0-beta.2",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -52,7 +52,7 @@
     "json4all": "^1.4.4",
     "lazy-some": "^0.1.0",
     "like-ar": "^0.5.3",
-    "login-plus": "^1.8.1",
+    "login-plus": "^1.9.0-beta.1",
     "memorystore": "^1.6.8",
     "mini-tools": "^1.13.7",
     "moment": "^2.30.1",
@@ -118,7 +118,8 @@
     "test-ui": "(npm run prepublish || echo \"continue w/error\") && mocha --reporter spec --single-run --bail  test/test-*.js",
     "test-karma": "(npm run prepublish || echo \"continue w/error\") && mocha --reporter spec --bail  test/test-k*.js",
     "test-why": "node --expose-internals ./node_modules/mocha/bin/_mocha --reporter spec --bail  test/test*.js",
-    "test-ci": "(npm run prepublish || echo \"continue w/error\") && mocha --reporter spec --bail  test/test*.js",
+    "test-ci": "npm test",
+    "test-cov": "(npm run prepublish || echo \"continue w/error\") && mocha --reporter spec --bail  test/test*.js",
     "test-good": "mocha --reporter spec --bail --check-leaks test/test*.js",
     "example-pu": "node test/puppeteer/first-step.js",
     "test-pu": "node ./test/download_puppeteer && mocha --reporter spec --bail --check-leaks --globals cptable --globals QUOTE --globals __core-js_shared__ test/test-pu.js",