npm release 1.9.0

Author: kyle-wannacott

npm/README.md

@@ -50,9 +50,11 @@ Refer to the documenation for examples how to use table-sort-js with [HTML.](htt
 | <th> classes | Description                                                                                                                             |
 | ------------------ | --------------------------------------------------------------------------------------------------------------------------------------- |
 | "order-by-desc"    | Order by descending on first click. (default is aescending)                                                                             |
-| "file-size"        | Sort file sizes(B->TiB) uses the binary prefix. (e.g KiB)                                                                               |
 | "data-sort"        | Sort by [data attributes](https://developer.mozilla.org/en-US/docs/Learn/HTML/Howto/Use_data_attributes), e.g <td data-sort="42"> |
-| "disable-sort"     | Disallow sorting the table by this specific column
+| "file-size-sort"   | Sort file sizes(B->TiB) uses the binary prefix. (e.g KiB)                                                                               |
+| "alpha-sort"       | Sort alphabetically (z11,z2); default is [natural sort](https://en.wikipedia.org/wiki/Natural_sort_order) (z2,z11).                     |
+| "punct-sort"       | Sort punctuation; default ignores punctuation.                                                                                          |
+| "disable-sort"     | Disallow sorting the table by this specific column.                                                                                     |
 
 #### Development:
 

npm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "table-sort-js",
-  "version": "1.8.2",
+  "version": "1.9.0",
   "description": "A JavaScript client-side HTML table sorting library with no dependencies required.",
   "license": "MIT",
   "repository": "LeeWannacott/table-sort-js",

npm/table-sort.js

@@ -207,7 +207,9 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) {
         }
       }
 
-      function naturalSortAscending(a, b) {
+      const isPunctSort = th.classList.contains("punct-sort");
+      const isAlphaSort = th.classList.contains("alpha-sort");
+      function sortAscending(a, b) {
         if (a.includes(`${fillValue}#`)) {
           return 1;
         } else if (b.includes(`${fillValue}#`)) {
@@ -216,13 +218,13 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) {
           return a.localeCompare(
             b,
             navigator.languages[0] || navigator.language,
-            { numeric: true, ignorePunctuation: true }
+            { numeric: !isAlphaSort, ignorePunctuation: !isPunctSort }
           );
         }
       }
 
-      function naturalSortDescending(a, b) {
-        return naturalSortAscending(b, a);
+      function sortDescending(a, b) {
+        return sortAscending(b, a);
       }
 
       function clearArrows(arrowUp = "▲", arrowDown = "▼") {
@@ -243,27 +245,27 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) {
 
       function sortColumn(sortDirection) {
         columnData.sort(sortDirection, {
-          numeric: true,
-          ignorePunctuation: true,
+          numeric: !isAlphaSort,
+          ignorePunctuation: !isPunctSort,
         });
       }
 
       if (timesClickedColumn === 1) {
         if (desc) {
           changeTableArrow(arrowDown);
-          sortColumn(naturalSortDescending);
+          sortColumn(sortDescending);
         } else {
           changeTableArrow(arrowUp);
-          sortColumn(naturalSortAscending);
+          sortColumn(sortAscending);
         }
       } else if (timesClickedColumn === 2) {
         timesClickedColumn = 0;
         if (desc) {
           changeTableArrow(arrowUp);
-          sortColumn(naturalSortAscending);
+          sortColumn(sortAscending);
         } else {
           changeTableArrow(arrowDown);
-          sortColumn(naturalSortDescending);
+          sortColumn(sortDescending);
         }
       }
     }
@@ -355,7 +357,7 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) {
         sortDataAttributes(visibleTableRows, columnData);
       }
 
-      const isFileSize = th.classList.contains("file-size");
+      const isFileSize = th.classList.contains("file-size-sort");
       if (isFileSize) {
         sortFileSize(visibleTableRows, columnData);
       }