@oliasoft-open-source/units 4.4.3 → 4.4.4

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var numbers = require('./units-OcXa9PZa.cjs');
+var numbers = require('./units-B3a2-Mk6.cjs');
 require('fraction.js');
 
 

package/dist/index.js

@@ -1,2 +1,2 @@
-export { a3 as ALT_UNITS, a7 as DEPRECATED_UNITS, a9 as INTERMEDIATE_CONVERSIONS, a6 as KNOWN_CONVERSIONS, aa as KNOWN_UNITS, a4 as LABELS, ab as QUANTITIES_DESCRIPTION, ac as UNITS_DESCRIPTION, a8 as UNIT_ALIASES, a5 as UNIT_FROM_KEY, O as allNumbers, i as altUnitsList, W as asFraction, S as charCount, c as checkAndCleanDecimalComma, Z as cleanNum, Y as cleanNumStr, q as convertAndGetValue, x as convertAndGetValueStrict, p as convertSamePrecision, j as convertTable, Q as displayNumber, R as displayNumberToFixed, P as formatNumber, U as fraction, g as getAltUnitsListByQuantity, T as getNumberOfDigitsToShow, b as getQuantities, o as getUnit, a as getUnitsForQuantity, n as getValue, H as isCloseTo, K as isCloseToOrGreaterThan, J as isCloseToOrLessThan, I as isDeepCloseTo, N as isEmptyValueWithUnit, V as isFraction, M as isNonNumerical, L as isNumeric, a1 as isScientificStringNum, a0 as isValidNum, m as isValueWithUnit, l as label, X as numFraction, A as round, E as roundByMagnitude, F as roundByMagnitudeToFixed, G as roundByRange, r as roundNumberWithLabel, D as roundToDecimalPrecision, B as roundToFixed, C as roundToPrecision, s as showAltUnitsList, e as split, a2 as stripLeadingZeros, t as to, h as toBase, _ as toNum, $ as toString, u as unitFromKey, d as unitFromQuantity, f as unum, k as unumWithUnit, v as validateAndClean, z as validateNumber, y as withPrettyUnitLabel, w as withUnit } from './units-BOzU7M3c.js';
+export { a3 as ALT_UNITS, a7 as DEPRECATED_UNITS, a9 as INTERMEDIATE_CONVERSIONS, a6 as KNOWN_CONVERSIONS, aa as KNOWN_UNITS, a4 as LABELS, ab as QUANTITIES_DESCRIPTION, ac as UNITS_DESCRIPTION, a8 as UNIT_ALIASES, a5 as UNIT_FROM_KEY, O as allNumbers, i as altUnitsList, W as asFraction, S as charCount, c as checkAndCleanDecimalComma, Z as cleanNum, Y as cleanNumStr, q as convertAndGetValue, x as convertAndGetValueStrict, p as convertSamePrecision, j as convertTable, Q as displayNumber, R as displayNumberToFixed, P as formatNumber, U as fraction, g as getAltUnitsListByQuantity, T as getNumberOfDigitsToShow, b as getQuantities, o as getUnit, a as getUnitsForQuantity, n as getValue, H as isCloseTo, K as isCloseToOrGreaterThan, J as isCloseToOrLessThan, I as isDeepCloseTo, N as isEmptyValueWithUnit, V as isFraction, M as isNonNumerical, L as isNumeric, a1 as isScientificStringNum, a0 as isValidNum, m as isValueWithUnit, l as label, X as numFraction, A as round, E as roundByMagnitude, F as roundByMagnitudeToFixed, G as roundByRange, r as roundNumberWithLabel, D as roundToDecimalPrecision, B as roundToFixed, C as roundToPrecision, s as showAltUnitsList, e as split, a2 as stripLeadingZeros, t as to, h as toBase, _ as toNum, $ as toString, u as unitFromKey, d as unitFromQuantity, f as unum, k as unumWithUnit, v as validateAndClean, z as validateNumber, y as withPrettyUnitLabel, w as withUnit } from './units-CNKurcic.js';
 import 'fraction.js';

package/dist/numbers/numbers.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var numbers = require('../units-OcXa9PZa.cjs');
+var numbers = require('../units-B3a2-Mk6.cjs');
 require('fraction.js');
 
 

package/dist/numbers/numbers.js

@@ -1,2 +1,2 @@
-export { a1 as isScientificStringNum, a0 as isValidNum, _ as toNum, $ as toString } from '../units-BOzU7M3c.js';
+export { a1 as isScientificStringNum, a0 as isValidNum, _ as toNum, $ as toString } from '../units-CNKurcic.js';
 import 'fraction.js';

package/dist/{units-OcXa9PZa.cjs → units-B3a2-Mk6.cjs}

@@ -710,6 +710,29 @@ function get_k_from_conf_int(a) {
 function get_conf_int_from_k(k) {
   return erf(k / sqrt(2));
 }
+const normalizeExponent = (input) => {
+  return input.replace(
+    /^([+-]?(?:\d+\.?\d*|\.\d+))[ ]*[eE][ ]*([+-]?[ ]*\d+)/,
+    (_m, mantissa, exp2) => {
+      let m = mantissa.endsWith(".") ? mantissa.slice(0, -1) : mantissa;
+      if (m.startsWith(".")) m = "0" + m;
+      const e = exp2.replace(/[ ]+/g, "");
+      return `${m}e${e}`;
+    }
+  );
+};
+function normalizeScientific(val) {
+  if (typeof val !== "string") return val;
+  let s = val.replace(/\u00A0|\u2007|\u202F/g, " ").trim();
+  if (isValueWithUnit(s)) {
+    const [val2, unit] = split(s);
+    const fixedLeft = normalizeExponent(val2.trim());
+    return `${fixedLeft}|${unit.trim()}`;
+  }
+  const m = s.match(/^([+-]?(?:\d+(?:\.\d*)?|\.\d+)\s*[eE]\s*[+-]?\s*\d+)\s+(.+)$/);
+  if (m) return `${normalizeExponent(m[1])}|${m[2].trim()}`;
+  return normalizeExponent(s);
+}
 
 const LABELS = Object.freeze({
   in: "in",
@@ -2267,6 +2290,7 @@ function checkAndCleanDecimalComma(val) {
 }
 function to(value, fromUnit, toUnit) {
   value = checkAndCleanDecimalComma(value);
+  value = normalizeScientific(value);
   if (toUnit === "undefined") {
     console.warn('Inconsistent "to unit" - debug call to "Units.to()"');
   }
@@ -2358,7 +2382,8 @@ function unum(numWithUnit, toUnit, fromUnit) {
   if (typeof numWithUnit === "string" && numWithUnit.startsWith("NaN") || typeof numWithUnit === "number" && isNaN(numWithUnit)) {
     return NaN;
   }
-  const cleanStr = cleanNumStr(numWithUnit).replaceAll("+", "");
+  const normInput = normalizeScientific(numWithUnit);
+  const cleanStr = cleanNumStr(normInput).replaceAll("+", "");
   const m = split(cleanStr);
   if (!m) {
     if (toUnit && fromUnit) return unum(numWithUnit + fromUnit, toUnit);

package/dist/{units-BOzU7M3c.js → units-CNKurcic.js}

@@ -708,6 +708,29 @@ function get_k_from_conf_int(a) {
 function get_conf_int_from_k(k) {
   return erf(k / sqrt(2));
 }
+const normalizeExponent = (input) => {
+  return input.replace(
+    /^([+-]?(?:\d+\.?\d*|\.\d+))[ ]*[eE][ ]*([+-]?[ ]*\d+)/,
+    (_m, mantissa, exp2) => {
+      let m = mantissa.endsWith(".") ? mantissa.slice(0, -1) : mantissa;
+      if (m.startsWith(".")) m = "0" + m;
+      const e = exp2.replace(/[ ]+/g, "");
+      return `${m}e${e}`;
+    }
+  );
+};
+function normalizeScientific(val) {
+  if (typeof val !== "string") return val;
+  let s = val.replace(/\u00A0|\u2007|\u202F/g, " ").trim();
+  if (isValueWithUnit(s)) {
+    const [val2, unit] = split(s);
+    const fixedLeft = normalizeExponent(val2.trim());
+    return `${fixedLeft}|${unit.trim()}`;
+  }
+  const m = s.match(/^([+-]?(?:\d+(?:\.\d*)?|\.\d+)\s*[eE]\s*[+-]?\s*\d+)\s+(.+)$/);
+  if (m) return `${normalizeExponent(m[1])}|${m[2].trim()}`;
+  return normalizeExponent(s);
+}
 
 const LABELS = Object.freeze({
   in: "in",
@@ -2265,6 +2288,7 @@ function checkAndCleanDecimalComma(val) {
 }
 function to(value, fromUnit, toUnit) {
   value = checkAndCleanDecimalComma(value);
+  value = normalizeScientific(value);
   if (toUnit === "undefined") {
     console.warn('Inconsistent "to unit" - debug call to "Units.to()"');
   }
@@ -2356,7 +2380,8 @@ function unum(numWithUnit, toUnit, fromUnit) {
   if (typeof numWithUnit === "string" && numWithUnit.startsWith("NaN") || typeof numWithUnit === "number" && isNaN(numWithUnit)) {
     return NaN;
   }
-  const cleanStr = cleanNumStr(numWithUnit).replaceAll("+", "");
+  const normInput = normalizeScientific(numWithUnit);
+  const cleanStr = cleanNumStr(normInput).replaceAll("+", "");
   const m = split(cleanStr);
   if (!m) {
     if (toUnit && fromUnit) return unum(numWithUnit + fromUnit, toUnit);

package/dist/units.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var numbers = require('./units-OcXa9PZa.cjs');
+var numbers = require('./units-B3a2-Mk6.cjs');
 require('fraction.js');
 
 

package/dist/units.js

@@ -1,2 +1,2 @@
-export { ae as EXP_NOTATION_RE, ad as SEPARATOR, i as altUnitsList, c as checkAndCleanDecimalComma, q as convertAndGetValue, x as convertAndGetValueStrict, p as convertSamePrecision, j as convertTable, g as getAltUnitsListByQuantity, b as getQuantities, o as getUnit, a as getUnitsForQuantity, n as getValue, m as isValueWithUnit, l as label, r as roundNumberWithLabel, s as showAltUnitsList, e as split, t as to, h as toBase, u as unitFromKey, d as unitFromQuantity, f as unum, k as unumWithUnit, v as validateAndClean, z as validateNumber, y as withPrettyUnitLabel, w as withUnit } from './units-BOzU7M3c.js';
+export { ae as EXP_NOTATION_RE, ad as SEPARATOR, i as altUnitsList, c as checkAndCleanDecimalComma, q as convertAndGetValue, x as convertAndGetValueStrict, p as convertSamePrecision, j as convertTable, g as getAltUnitsListByQuantity, b as getQuantities, o as getUnit, a as getUnitsForQuantity, n as getValue, m as isValueWithUnit, l as label, r as roundNumberWithLabel, s as showAltUnitsList, e as split, t as to, h as toBase, u as unitFromKey, d as unitFromQuantity, f as unum, k as unumWithUnit, v as validateAndClean, z as validateNumber, y as withPrettyUnitLabel, w as withUnit } from './units-CNKurcic.js';
 import 'fraction.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oliasoft-open-source/units",
-  "version": "4.4.3",
+  "version": "4.4.4",
   "description": "Package for units management",
   "keywords": [],
   "license": "MIT",