@nxtedition/ranges 1.0.5 → 1.0.7

package/lib/index.js

@@ -2,6 +2,16 @@
 
 const EMPTY_ARR                   = Object.freeze([])
 
+function isValidRange(range         )                 {
+  return (
+    Array.isArray(range) &&
+    range.length === 2 &&
+    Number.isFinite(range[0]) &&
+    Number.isFinite(range[1]) &&
+    range[1] > range[0]
+  )
+}
+
 export function merge(ranges         )                   {
   if (!Array.isArray(ranges) || ranges.length === 0) {
     return EMPTY_ARR
@@ -9,26 +19,17 @@ export function merge(ranges         )                   {
 
   if (ranges.length === 1) {
     const range = ranges[0]
-    return Array.isArray(range) &&
-      range.length === 2 &&
-      Number.isFinite(range[0]) &&
-      Number.isFinite(range[1]) &&
-      range[1] > range[0]
-      ? ranges
-      : EMPTY_ARR
+    return isValidRange(range) ? [[range[0], range[1]]] : EMPTY_ARR
   }
 
-  ranges = ranges.filter(
-    (range) =>
-      Array.isArray(range) &&
-      range.length === 2 &&
-      Number.isFinite(range[0]) &&
-      Number.isFinite(range[1]) &&
-      range[1] > range[0],
-  )
+  ranges = ranges.filter(isValidRange)
+
+  if (ranges.length === 0) {
+    return EMPTY_ARR
+  }
 
-  if (ranges.length <= 1) {
-    return ranges
+  if (ranges.length === 1) {
+    return [[ranges[0][0], ranges[0][1]]]
   }
 
   ranges.sort((a, b) => a[0] - b[0])
@@ -41,16 +42,6 @@ export function merge(ranges         )                   {
     const range = ranges[n]
     const top = stack[stack.length - 1]
 
-    if (
-      !Array.isArray(range) ||
-      range.length !== 2 ||
-      !Number.isFinite(range[0]) ||
-      !Number.isFinite(range[1]) ||
-      range[0] > range[1]
-    ) {
-      continue
-    }
-
     if (top[1] < range[0]) {
       stack.push([range[0], range[1]])
     } else if (top[1] < range[1]) {
@@ -62,23 +53,35 @@ export function merge(ranges         )                   {
 }
 
 export function subtract(a                  , b                  )                   {
-  const pending                     = a.map((r) => [r[0], r[1]])
+  if (!Array.isArray(a) || a.length === 0) {
+    return EMPTY_ARR
+  }
 
-  const c          = []
+  const pending                     = []
+  for (let i = a.length - 1; i >= 0; --i) {
+    const r = a[i]
+    if (isValidRange(r)) {
+      pending.push([r[0], r[1]])
+    }
+  }
 
-  while (pending.length > 0) {
-    const ar = pending.shift() 
+  const validB          = Array.isArray(b) ? b.filter(isValidRange) : []
 
-    if (ar[1] <= ar[0]) {
-      continue
-    }
+  const c          = []
 
-    const br = b.find((br) => ar[0] < br[1] && br[0] < ar[1])
+  while (pending.length > 0) {
+    const ar = pending.pop() 
+    const br = validB.find((br) => ar[0] < br[1] && br[0] < ar[1])
     if (!br) {
       c.push(ar)
     } else {
-      pending.unshift([br[1], ar[1]])
-      pending.unshift([ar[0], br[0]])
+      // Push right half first so left is popped next and processed first.
+      if (br[1] < ar[1]) {
+        pending.push([br[1], ar[1]])
+      }
+      if (ar[0] < br[0]) {
+        pending.push([ar[0], br[0]])
+      }
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/ranges",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -14,7 +14,7 @@
     "access": "public"
   },
   "scripts": {
-    "build": "rimraf lib && tsc && amaroc ./src/index.ts && mv src/index.js lib/",
+    "build": "rimraf lib && tsc -p tsconfig.build.json && amaroc ./src/index.ts && mv src/index.js lib/",
     "prepublishOnly": "yarn build",
     "typecheck": "tsc --noEmit",
     "test": "node --test",
@@ -28,5 +28,5 @@
     "rimraf": "^6.1.3",
     "typescript": "^5.9.3"
   },
-  "gitHead": "a7202d8b4d3decaff213576df560e8cd5775db37"
+  "gitHead": "7c9c7457c885c644c7a1e70ef894d4727ce240d6"
 }