Merge pull request #30 from pennions/fix/logical-sorting

fix: added logical sorting alghorithm so a1,b1,a2,b2 will get sorted a1,a2,b1,b1

dist/flightkit-v0.0.11/flightkit.js → dist/flightkit-v0.0.12/flightkit.js

@@ -50,8 +50,42 @@
         return value.toLocaleLowerCase() === 'true'
     }
 
+    function logicalSort(a, b, direction) {
+        const regex = /^([a-zA-Z]*)(\d*)|(\d*)([a-zA-Z]*)$/;
+
+        /** Extract the parts of the strings and make them case insensitive, 
+         * else A1 and a1 will not allow multisort, which I think is confusing */
+        const matchA = a.toString().toLocaleLowerCase().match(regex);
+        const matchB = b.toString().toLocaleLowerCase().match(regex);
+
+        /** Determine the character and number parts */
+        const charPartA = matchA[1] || matchA[4];
+        const numPartA = parseInt(matchA[2] || matchA[3], 10) || 0;
+
+        const charPartB = matchB[1] || matchB[4];
+        const numPartB = parseInt(matchB[2] || matchB[3], 10) || 0;
+
+        /** check which order */
+        const desc = direction.includes('desc');
+
+        let leftHandCharValue = desc ? charPartB : charPartA;
+        let rightHandCharValue = desc ? charPartA : charPartB;
+        let leftHandNumValue = desc ? numPartB : numPartA;
+        let rightHandNumValue = desc ? numPartA : numPartB;
+
+        /** Compare the character parts first */
+        if (leftHandCharValue < rightHandCharValue) return -1;
+        if (leftHandCharValue > rightHandCharValue) return 1;
+
+        /* If characters are the same, compare the number parts **/
+        return leftHandNumValue - rightHandNumValue;
+    }
+
     function sortFunction(applicableSorters, index = 0) {
         return function (a, b) {
+            if (index > 0) {
+                debugger;
+            }
 
             const { propertyName, direction } = applicableSorters[index];
 
@@ -74,13 +108,14 @@
             const valueAHasNumber = extractNumber(valueA);
             const valueBHasNumber = extractNumber(valueB);
 
+            let logicalSortNeeded = false;
+
             if (valuesAreNumbers) {
                 valueA = parseFloat(valueA).toPrecision(12);
                 valueB = parseFloat(valueB).toPrecision(12);
             }
             else if (valueAHasNumber !== null && valueBHasNumber !== null) {
-                valueA = parseFloat(valueAHasNumber).toPrecision(12);
-                valueB = parseFloat(valueBHasNumber).toPrecision(12);
+                logicalSortNeeded = true;
             }
 
             if (valuesAreBooleans) {
@@ -105,10 +140,13 @@
                 }
             }
 
-            // check if -1 or 1, 0. if 0 then check again.
+            /** check if -1 or 1, 0. if 0 then check again. */
             let comparisonValue = 0;
 
-            if (valuesAreBooleans || valuesAreDates || valuesAreNumbers) {
+            if (logicalSortNeeded) {
+                comparisonValue = logicalSort(valueA, valueB, direction);
+            }
+            else if (valuesAreBooleans || valuesAreDates || valuesAreNumbers) {
                 /** Yes this works for all these things. :D */
                 comparisonValue = leftHandValue - rightHandValue;
             }

flightkit/flightkit-functions/sorting.js

@@ -48,8 +48,42 @@ function getBooleanValue(value) {
     return value.toLocaleLowerCase() === 'true'
 }
 
+function logicalSort(a, b, direction) {
+    const regex = /^([a-zA-Z]*)(\d*)|(\d*)([a-zA-Z]*)$/;
+
+    /** Extract the parts of the strings and make them case insensitive, 
+     * else A1 and a1 will not allow multisort, which I think is confusing */
+    const matchA = a.toString().toLocaleLowerCase().match(regex);
+    const matchB = b.toString().toLocaleLowerCase().match(regex);
+
+    /** Determine the character and number parts */
+    const charPartA = matchA[1] || matchA[4];
+    const numPartA = parseInt(matchA[2] || matchA[3], 10) || 0;
+
+    const charPartB = matchB[1] || matchB[4];
+    const numPartB = parseInt(matchB[2] || matchB[3], 10) || 0;
+
+    /** check which order */
+    const desc = direction.includes('desc');
+
+    let leftHandCharValue = desc ? charPartB : charPartA;
+    let rightHandCharValue = desc ? charPartA : charPartB;
+    let leftHandNumValue = desc ? numPartB : numPartA;
+    let rightHandNumValue = desc ? numPartA : numPartB;
+
+    /** Compare the character parts first */
+    if (leftHandCharValue < rightHandCharValue) return -1;
+    if (leftHandCharValue > rightHandCharValue) return 1;
+
+    /* If characters are the same, compare the number parts **/
+    return leftHandNumValue - rightHandNumValue;
+}
+
 function sortFunction(applicableSorters, index = 0) {
     return function (a, b) {
+        if (index > 0) {
+            debugger;
+        }
 
         const { propertyName, direction } = applicableSorters[index];
 
@@ -72,13 +106,14 @@ function sortFunction(applicableSorters, index = 0) {
         const valueAHasNumber = extractNumber(valueA)
         const valueBHasNumber = extractNumber(valueB)
 
+        let logicalSortNeeded = false;
+
         if (valuesAreNumbers) {
             valueA = parseFloat(valueA).toPrecision(12);
             valueB = parseFloat(valueB).toPrecision(12);
         }
         else if (valueAHasNumber !== null && valueBHasNumber !== null) {
-            valueA = parseFloat(valueAHasNumber).toPrecision(12);
-            valueB = parseFloat(valueBHasNumber).toPrecision(12);
+            logicalSortNeeded = true;
         }
 
         if (valuesAreBooleans) {
@@ -103,10 +138,13 @@ function sortFunction(applicableSorters, index = 0) {
             }
         }
 
-        // check if -1 or 1, 0. if 0 then check again.
+        /** check if -1 or 1, 0. if 0 then check again. */
         let comparisonValue = 0;
 
-        if (valuesAreBooleans || valuesAreDates || valuesAreNumbers) {
+        if (logicalSortNeeded) {
+            comparisonValue = logicalSort(valueA, valueB, direction);
+        }
+        else if (valuesAreBooleans || valuesAreDates || valuesAreNumbers) {
             /** Yes this works for all these things. :D */
             comparisonValue = leftHandValue - rightHandValue;
         }

flightkit/public/js/databaseset.js

@@ -6,21 +6,48 @@ window.databaseSet = {
                 "column2": 2,
                 "column3": true,
                 "column4": null,
-                "column5": "value5"
+                "column5": "value5",
+                "column6": "a1"
             },
             {
                 "column1": "value6",
                 "column2": 7,
                 "column3": false,
                 "column4": "value8",
-                "column5": 9
+                "column5": 9,
+                "column6": "b2"
             },
             {
                 "column1": "value10",
                 "column2": 11,
                 "column3": true,
                 "column4": "value12",
-                "column5": 13
+                "column5": 13,
+                "column6": "A1"
+            },
+            {
+                "column1": "value14",
+                "column2": 15,
+                "column3": false,
+                "column4": "value16",
+                "column5": 17,
+                "column6": "b3"
+            },
+            {
+                "column1": "value18",
+                "column2": 19,
+                "column3": true,
+                "column4": "value20",
+                "column5": 21,
+                "column6": "a2"
+            },
+            {
+                "column1": "value18",
+                "column2": 19,
+                "column3": true,
+                "column4": "value20",
+                "column5": 21,
+                "column6": "b1"
             }
         ],
         "table2": [
@@ -29,14 +56,16 @@ window.databaseSet = {
                 "column2": 15,
                 "column3": false,
                 "column4": "value16",
-                "column5": 17
+                "column5": 17,
+                "column6": "b3"
             },
             {
                 "column1": "value18",
                 "column2": 19,
                 "column3": true,
                 "column4": "value20",
-                "column5": 21
+                "column5": 21,
+                "column6": "a2"
             }
         ]
     },

package.json

@@ -1,8 +1,8 @@
 {
   "name": "@pennions/ibiss",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "avian_version": "0.0.2",
-  "flightkit_version": "0.0.11",
+  "flightkit_version": "0.0.12",
   "htmx_plugin_version": "0.0.1",
   "rocketjs_version": "0.0.1",
   "description": "Frontend library of Pennions",