Add Internationalization to sorting.

petersirka · petersirka · commit 3bfc9ad9d1a4 · 2017-08-18T14:09:22.000+02:00
diff --git a/changes.txt b/changes.txt
@@ -40,6 +40,7 @@
 - updated: `RESTBuilder.file(name, filetarget, [filename])` can contain `filename` instead of buffer
 - updated: `U.streamer(beg, [end], onItem(item, index), [skip], [stream])` added a new argument `stream` for flushing buffer
 - updated: `ErrorBuilder.addTransform(name, callback(isResponse))` by adding new argument `isresponse`
+- updated: `sorting` (framework + NoSQL embedded), now supports `internationalization`
 
 - fixed: (IMPORTANT) long messages in WebSocket
 - fixed: (IMPORTANT) `controller` param in schemas
diff --git a/nosql.js b/nosql.js
@@ -60,6 +60,7 @@ const CLUSTER_UNLOCK_COUNTER = { TYPE: 'nosql-counter-unlock' };
 const FLAGS_READ = ['get'];
 const COUNTER_MMA = [0, 0];
 const NOSQL_STR_END = { '"': true, ',': true, '}': true };
+const COMPARER = Intl.Collator().compare;
 
 Object.freeze(EMPTYARRAY);
 
@@ -1168,8 +1169,8 @@ function nosqlsortvalue(a, b, sorter) {
 	if (type === 'number')
 		return sorter.asc ? a > b : a < b;
 	else if (type === 'string') {
-		a = (a.length > 5 ? a.substring(0, 5) : a).toLowerCase().removeDiacritics();
-		var c = a.localeCompare(b);
+		a = (a.length > 5 ? a.substring(0, 5) : a);
+		var c = COMPARER(a, b);
 		return sorter.asc ? c === 1 : c === -1;
 	} else if (a instanceof Date)
 		return sorter.asc ? a > b : a < b;
diff --git a/utils.js b/utils.js
@@ -36,6 +36,7 @@ const Fs = require('fs');
 const Events = require('events');
 const Crypto = require('crypto');
 const CONCAT = [null, null];
+const COMPARER = Intl.Collator().compare;
 
 if (!global.framework_utils)
 	global.framework_utils = exports;
@@ -3130,7 +3131,7 @@ String.prototype.contains = function(value, mustAll) {
  * @return {Number}
  */
 String.prototype.localeCompare2 = function(value) {
-	return this.removeDiacritics().localeCompare(value.removeDiacritics());
+	return COMPARER(this, value);
 };
 
 /**
@@ -4377,7 +4378,7 @@ Array.prototype.quicksort = Array.prototype.orderBy = function(name, asc, maxlen
 
 		// String
 		if (type === 1) {
-			return va && vb ? (asc ? (va.length > maxlength ? va.substring(0, maxlength) : va).removeDiacritics().localeCompare((vb.length > maxlength ? vb.substring(0, maxlength) : vb).removeDiacritics()) : (vb.length > maxlength ? vb.substring(0, maxlength) : vb).removeDiacritics().localeCompare((va.length > maxlength ? va.substring(0, maxlength) : va).removeDiacritics())) : 0;
+			return va && vb ? (asc ? COMPARER(va.length > maxlength ? va.substring(0, maxlength) : va, vb.length > maxlength ? vb.substring(0, maxlength) : vb) : COMPARER(vb.length > maxlength ? vb.substring(0, maxlength) : vb, va.length > maxlength ? va.substring(0, maxlength) : va)) : 0;
 		} else if (type === 2) {
 			return va > vb ? (asc ? 1 : -1) : va < vb ? (asc ? -1 : 1) : 0;
 		} else if (type === 3) {
