extra-utils 5.20.0 → 5.21.0

package/lib/number/remap-to-index.js.map

@@ -1 +1 @@
-{"version":3,"file":"remap-to-index.js","sourceRoot":"","sources":["../../src/number/remap-to-index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAElC,MAAM,UAAU,YAAY,CAC1B,KAAa,EACb,KAA0C,EAC1C,KAA6B;IAE7B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CACtB,KAAK,CACH,KAAK,EACL,KAAK,EACL,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAClB,CACF,CAAA;IAED,OAAO,KAAK,KAAK,KAAK,CAAC,MAAM;QACxB,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;QAClB,CAAC,CAAC,KAAK,CAAA;AACd,CAAC"}
+{"version":3,"file":"remap-to-index.js","sourceRoot":"","sources":["../../src/number/remap-to-index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAElC,MAAM,UAAU,YAAY,CAC1B,KAAa,EACb,KAA0C,EAC1C,KAA6B;IAE7B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CACtB,KAAK,CACH,KAAK,EACL,KAAK,EACL,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAClB,CACF,CAAA;IAED,OAAO,KAAK,KAAK,KAAK,CAAC,MAAM;QACxB,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;QAClB,CAAC,CAAC,KAAK,CAAA;AAUd,CAAC"}

package/lib/number/remap.js

@@ -1,6 +1,16 @@
+import { assert } from '@blackglory/errors';
 export function remap(value, [oldMin, oldMax], [newMin, newMax]) {
-    return (value - oldMin) / (oldMax - oldMin)
-        * (newMax - newMin)
-        + newMin;
+    assert(oldMin <= oldMax, 'The oldMin must be less than or equal to oldMax');
+    assert(newMin <= newMax, 'The newMin must be less than or equal to newMax');
+    assert(value >= oldMin && value <= oldMax, 'The parameter value must between oldMin and oldMax');
+    if (oldMin === oldMax) {
+        assert(newMin === newMax, 'The old range cannot be zero-length unless the new range is also zero-length');
+        return newMin;
+    }
+    else {
+        return (value - oldMin) / (oldMax - oldMin)
+            * (newMax - newMin)
+            + newMin;
+    }
 }
 //# sourceMappingURL=remap.js.map

package/lib/number/remap.js.map

@@ -1 +1 @@
-{"version":3,"file":"remap.js","sourceRoot":"","sources":["../../src/number/remap.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,KAAK,CACnB,KAAa,EACb,CAAC,MAAM,EAAE,MAAM,CAA4C,EAC3D,CAAC,MAAM,EAAE,MAAM,CAA4C;IAE3D,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC;UACpC,CAAC,MAAM,GAAG,MAAM,CAAC;UACjB,MAAM,CAAA;AACf,CAAC"}
+{"version":3,"file":"remap.js","sourceRoot":"","sources":["../../src/number/remap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAE3C,MAAM,UAAU,KAAK,CACnB,KAAa,EACb,CAAC,MAAM,EAAE,MAAM,CAA4C,EAC3D,CAAC,MAAM,EAAE,MAAM,CAA4C;IAE3D,MAAM,CAAC,MAAM,IAAI,MAAM,EAAE,iDAAiD,CAAC,CAAA;IAC3E,MAAM,CAAC,MAAM,IAAI,MAAM,EAAE,iDAAiD,CAAC,CAAA;IAC3E,MAAM,CACJ,KAAK,IAAI,MAAM,IAAI,KAAK,IAAI,MAAM,EAClC,oDAAoD,CACrD,CAAA;IAED,IAAI,MAAM,KAAK,MAAM,EAAE;QACrB,MAAM,CACJ,MAAM,KAAK,MAAM,EACjB,8EAA8E,CAC/E,CAAA;QAED,OAAO,MAAM,CAAA;KACd;SAAM;QACL,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC;cACpC,CAAC,MAAM,GAAG,MAAM,CAAC;cACjB,MAAM,CAAA;KACd;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "extra-utils",
-  "version": "5.20.0",
+  "version": "5.21.0",
   "description": "Utilities for JavaScript and Typescript",
   "files": [
     "src",
@@ -59,6 +59,7 @@
     "typescript-transform-paths": "^3.4.6"
   },
   "dependencies": {
+    "@blackglory/errors": "^3.1.0",
     "justypes": "^4.2.0",
     "lodash-es": "^4.17.21"
   }

package/src/number/remap-to-index.ts

@@ -17,4 +17,13 @@ export function remapToIndex(
   return index === items.length
        ? items.length - 1
        : index
+
+  // 上方代码在均匀性上优于使用`Math.round`的实现:
+  // return Math.round(
+  //   remap(
+  //     value
+  //   , range
+  //   , [0, items.length - 1]
+  //   )
+  // )
 }

package/src/number/remap.ts

@@ -1,9 +1,27 @@
+import { assert } from '@blackglory/errors'
+
 export function remap(
   value: number
 , [oldMin, oldMax]: readonly [oldMin: number, oldMax: number]
 , [newMin, newMax]: readonly [newMin: number, newMax: number]
 ): number {
-  return (value - oldMin) / (oldMax - oldMin)
-       * (newMax - newMin)
-       + newMin
+  assert(oldMin <= oldMax, 'The oldMin must be less than or equal to oldMax')
+  assert(newMin <= newMax, 'The newMin must be less than or equal to newMax')
+  assert(
+    value >= oldMin && value <= oldMax
+  , 'The parameter value must between oldMin and oldMax'
+  )
+
+  if (oldMin === oldMax) {
+    assert(
+      newMin === newMax
+    , 'The old range cannot be zero-length unless the new range is also zero-length'
+    )
+
+    return newMin
+  } else {
+    return (value - oldMin) / (oldMax - oldMin)
+         * (newMax - newMin)
+         + newMin
+  }
 }