From ba24e12454fcf19f9a319d7541793d4e1437faa4 Mon Sep 17 00:00:00 2001
From: Chris van Marle <qistoph@gmail.com>
Date: Fri, 12 Oct 2018 15:39:06 +0200
Subject: [PATCH] Update hexadecimal sort after review

- Use Array.map instead of for-loop
- Add test case
---
 src/core/operations/Sort.mjs       | 22 +++++++++-------------
 test/tests/operations/SeqUtils.mjs | 11 +++++++++++
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/core/operations/Sort.mjs b/src/core/operations/Sort.mjs
index 20f797f8..7e024d45 100644
--- a/src/core/operations/Sort.mjs
+++ b/src/core/operations/Sort.mjs
@@ -143,22 +143,18 @@ class Sort extends Operation {
      * @returns {number}
      */
     static _hexadecimalSort(a, b) {
-        const a_ = a.split(/([^\da-f]+)/i),
+        let a_ = a.split(/([^\da-f]+)/i),
             b_ = b.split(/([^\da-f]+)/i);
 
-        for (let i = 0; i < a_.length; ++i) {
-            const t = parseInt(a_[i], 16);
-            if (!isNaN(t)) {
-                a_[i] = t;
-            }
-        }
+        a_ = a_.map(v => {
+            const t = parseInt(v, 16);
+            return isNaN(t) ? v : t;
+        });
 
-        for (let i = 0; i < b_.length; ++i) {
-            const t = parseInt(b_[i], 16);
-            if (!isNaN(t)) {
-                b_[i] = t;
-            }
-        }
+        b_ = b_.map(v => {
+            const t = parseInt(v, 16);
+            return isNaN(t) ? v : t;
+        });
 
         for (let i = 0; i < a_.length && i < b.length; ++i) {
             if (isNaN(a_[i]) && !isNaN(b_[i])) return 1; // Numbers after non-numbers
diff --git a/test/tests/operations/SeqUtils.mjs b/test/tests/operations/SeqUtils.mjs
index 88acde8f..4516298a 100644
--- a/test/tests/operations/SeqUtils.mjs
+++ b/test/tests/operations/SeqUtils.mjs
@@ -30,4 +30,15 @@ TestRegister.addTests([
             }
         ],
     },
+    {
+        name: "SeqUtils - Hexadecimal sort",
+        input: "06,08,0a,0d,0f,1,10,11,12,13,14,15,16,17,18,19,1a,1b,1c,1d,1e,1f,2,3,4,5,7,9,b,c,e",
+        expectedOutput: "1,2,3,4,5,06,7,08,9,0a,b,c,0d,e,0f,10,11,12,13,14,15,16,17,18,19,1a,1b,1c,1d,1e,1f",
+        recipeConfig: [
+            {
+                "op": "Sort",
+                "args": ["Comma", false, "Numeric (hexadecimal)"]
+            }
+        ],
+    },
 ]);