best-globals 2.0.0 → 2.0.1

package/best-globals.d.ts

@@ -120,8 +120,7 @@ declare module "best-globals"{
         function escapeRegExp(regExpString:string):string // minimalistic
         function escapeStringRegexp(regexpString:string):string // can put inside other regexp with [ ]
         function forOrder(text:string):string
-        const orderingCriteria:Record<string, <U>(x:U)=>U|string>
-        function compareForOrder<T extends {}>(sortColumns:{column: keyof T, order?:1|-1, orderCriterion:string, orderFun?:<U>(x:U)=>U|string}[]):(row1:T, row2:T)=>0|1|-1
+        function compareForOrder<T extends {}>(sortColumns:{column: keyof T, order?:1|-1, fun?:<U>(x:U)=>U|string}[]):(row1:T, row2:T)=>0|1|-1
         function sleep(ms:number):Promise<void>
         function serie(length:number):number[]
         function serie(first:number, length:number):number[]

package/best-globals.js

@@ -811,11 +811,9 @@ bestGlobals.forOrder = function forOrder(text){
     return main.join('')+signs.join('')+'   '+text;
 };
 
-
-bestGlobals.orderingCriteria = {
-    native: x => x,
-    default: bestGlobals.forOrder
-}
+bestGlobals.forOrder.Native = function forOrderNative(a){
+    return a;
+};
 
 bestGlobals.nullsOrder = 1; // 1=last -1=first;
 
@@ -834,9 +832,8 @@ bestGlobals.compareForOrder = function compareForOrder(sortColumns){
             }else if(row2[column]==null){
                 return -thisModule.nullsOrder;
             }else{
-                var columnOrderFun = sortColumns[i].orderFunc||thisModule.orderingCriteria[sortColumns[i].orderCriterion||'default'];
-                var a = columnOrderFun(row1[column]);
-                var b = columnOrderFun(row2[column]);
+                var a=(sortColumns[i].func||thisModule.forOrder)(row1[column]);
+                var b=(sortColumns[i].func||thisModule.forOrder)(row2[column]);
                 if(a>b){
                     return 1*order;
                 }else if(a<b){

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "best-globals",
   "description": "common global function and constants - i.e. changes",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/best-globals",