best-globals 1.1.5 → 2.0.0

package/best-globals.d.ts

@@ -120,7 +120,8 @@ 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
-        function compareForOrder<T extends {}>(sortColumns:{column: keyof T, order?:1|-1, fun?:<U>(x:U)=>U|string}[]):(row1:T, row2:T)=>0|1|-1
+        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 sleep(ms:number):Promise<void>
         function serie(length:number):number[]
         function serie(first:number, length:number):number[]

package/best-globals.js

@@ -785,8 +785,8 @@ bestGlobals.forOrder = function forOrder(text){
     var normal=text.toString()
     .replace(letterTranslatorRegexp, function(letter){ return letterTranslator[letter]; })
     .replace(
-        /([a-z]+)|((-?)0*(0|[1-9][0-9]*))|([^a-z0-9])/ig, 
-        function(t, letters, nums, sign, integer, others){
+        /([a-z]+)|((-?)0*(0|[1-9][0-9]*)(\.[0-9]+)?)|([^a-z0-9])/ig, 
+        function(t, letters, nums, sign, integer, decimals, others){
             if(letters){
                 main.push(' '+letters.toLowerCase());
             }
@@ -799,7 +799,7 @@ bestGlobals.forOrder = function forOrder(text){
                 }else{
                     negative = false;
                 }
-                main.push(' '+(negative?'A':'')+String.fromCharCode(65+coalesce(integer,'').length)+coalesce(integer,''));
+                main.push(' '+(negative?'A':'')+String.fromCharCode(65+coalesce(integer,'').length)+coalesce(integer,'')+coalesce(decimals,''));
             }
             canBeNegative=false;
             if(others){
@@ -811,9 +811,11 @@ bestGlobals.forOrder = function forOrder(text){
     return main.join('')+signs.join('')+'   '+text;
 };
 
-bestGlobals.forOrder.Native = function forOrderNative(a){
-    return a;
-};
+
+bestGlobals.orderingCriteria = {
+    native: x => x,
+    default: bestGlobals.forOrder
+}
 
 bestGlobals.nullsOrder = 1; // 1=last -1=first;
 
@@ -832,8 +834,9 @@ bestGlobals.compareForOrder = function compareForOrder(sortColumns){
             }else if(row2[column]==null){
                 return -thisModule.nullsOrder;
             }else{
-                var a=(sortColumns[i].func||thisModule.forOrder)(row1[column]);
-                var b=(sortColumns[i].func||thisModule.forOrder)(row2[column]);
+                var columnOrderFun = sortColumns[i].orderFunc||thisModule.orderingCriteria[sortColumns[i].orderCriterion||'default'];
+                var a = columnOrderFun(row1[column]);
+                var b = columnOrderFun(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": "1.1.5",
+  "version": "2.0.0",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/best-globals",
@@ -18,23 +18,23 @@
   "dependencies": {},
   "devDependencies": {
     "colors": "~1.4.0",
-    "cookie-parser": "^1.4.6",
+    "cookie-parser": "^1.4.7",
     "expect.js": "~0.3.1",
-    "express": "^4.19.2",
-    "express-session": "^1.18.0",
-    "karma": "^6.4.3",
+    "express": "^5.1.0",
+    "express-session": "^1.18.1",
+    "karma": "^6.4.4",
     "karma-chrome-launcher": "^3.2.0",
     "karma-coverage": "^2.2.1",
     "karma-coverage-html-index-reporter": "^1.0.2",
     "karma-expect": "^1.1.3",
     "karma-firefox-launcher": "^2.1.3",
     "karma-mocha": "^2.0.1",
-    "nyc": "~17.0.0",
-    "mini-tools": "^1.12.1",
-    "mocha": "~10.4.0",
-    "pg-promise-strict": "^1.4.0",
+    "nyc": "~17.1.0",
+    "mini-tools": "^1.13.2",
+    "mocha": "~11.2.2",
+    "pg-promise-strict": "^1.4.2",
     "require-bro": "^0.3.1",
-    "sinon": "~18.0.0",
+    "sinon": "~20.0.0",
     "audit-copy": "~0.1.0",
     "discrepances": "~0.2.8"
   },