@tim-code/my-util 0.8.0 → 0.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tim-code/my-util",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "",
   "type": "module",
   "author": "Tim Sprowl",

package/src/array.js

@@ -194,6 +194,12 @@ function naturalCompare(a, b) {
     b = b.slice(1, b.length)
     return b.localeCompare(a, undefined, { numeric: true })
   }
+  if (a[0] === "+" && !Number.isNaN(Number(a))) {
+    a = a.slice(1, a.length)
+  }
+  if (b[0] === "+" && !Number.isNaN(Number(b))) {
+    b = b.slice(1, b.length)
+  }
   return a.localeCompare(b, undefined, { numeric: true })
 }
 

package/src/array.test.js

@@ -542,6 +542,18 @@ describe("naturalAsc", () => {
     arr.sort(naturalAsc())
     expect(arr).toEqual(["-10", "-2", "-1"])
   })
+
+  it("can sort negative to positive", () => {
+    const arr = ["-2", "+5", "0"]
+    arr.sort(naturalAsc())
+    expect(arr).toEqual(["-2", "0", "+5"])
+  })
+
+  it("handles leading plus signs on numeric-like strings", () => {
+    const arr = ["a", "+10", "+2", "+1"]
+    arr.sort(naturalAsc())
+    expect(arr).toEqual(["+1", "+2", "+10", "a"])
+  })
 })
 
 describe("naturalDesc", () => {
@@ -586,6 +598,18 @@ describe("naturalDesc", () => {
     arr.sort(naturalDesc())
     expect(arr).toEqual(["-1", "-2", "-10"])
   })
+
+  it("can sort positive to negative", () => {
+    const arr = ["+5", "-2", "0"]
+    arr.sort(naturalDesc())
+    expect(arr).toEqual(["+5", "0", "-2"])
+  })
+
+  it("handles leading plus signs on numeric-like strings (descending)", () => {
+    const arr = ["+1", "+2", "+10", "a"]
+    arr.sort(naturalDesc())
+    expect(arr).toEqual(["a", "+10", "+2", "+1"])
+  })
 })
 
 describe("multilevel", () => {

package/src/time.js

@@ -1,9 +1,5 @@
 import { mod } from "./math.js"
 
-// `floorMinute` at first glance seems ugly and something like `floor: "minute"` seems better.
-// However, practically and realistically, it doesn't seem like we need other values for floor besides "second" and "minute".
-// So, then it seems more problematic to rely on an exact string to be passed... probably would need to throw on some other value.
-// We don't really ever want to disable flooring because we want timestamp, date, and time returned to represent the same thing.
 /**
  * Gets various ways of representing the current time in EDT. Floors to nearest second by default.
  * @param {Object} $1
@@ -91,7 +87,7 @@ export function getDayIndexInWeek(string = today()) {
 
 /**
  * Get the minute from a time string.
- * @param {string} time HH:mm or HH:mm::ss
+ * @param {string} time HH:mm or HH:mm:ss
  * @returns {number} Between 0 and 59 inclusive
  */
 export function getMinute(time) {