shelving 1.104.0 → 1.105.1

package/package.json

@@ -11,7 +11,7 @@
 		"state-management",
 		"query-builder"
 	],
-	"version": "1.104.0",
+	"version": "1.105.1",
 	"repository": "https://github.com/dhoulb/shelving",
 	"author": "Dave Houlbrooke <dave@shax.com>",
 	"license": "0BSD",

package/util/duration.js

@@ -5,20 +5,20 @@ import { TIME_UNITS } from "./units.js";
 function _getTimeUnit(ms) {
     const abs = Math.abs(ms);
     if (abs > 18 * MONTH)
-        return TIME_UNITS.unit("year");
+        return TIME_UNITS.getUnit("year");
     if (abs > 10 * WEEK)
-        return TIME_UNITS.unit("month");
+        return TIME_UNITS.getUnit("month");
     if (abs > 2 * WEEK)
-        return TIME_UNITS.unit("week");
+        return TIME_UNITS.getUnit("week");
     if (abs > DAY)
-        return TIME_UNITS.unit("day");
+        return TIME_UNITS.getUnit("day");
     if (abs > HOUR)
-        return TIME_UNITS.unit("hour");
+        return TIME_UNITS.getUnit("hour");
     if (abs > 9949)
-        return TIME_UNITS.unit("minute");
+        return TIME_UNITS.getUnit("minute");
     if (abs > SECOND)
-        return TIME_UNITS.unit("second");
-    return TIME_UNITS.unit("millisecond");
+        return TIME_UNITS.getUnit("second");
+    return TIME_UNITS.getUnit("millisecond");
 }
 /** Default number options for duration (no decimal places and rounding down). */
 const NUMBER_OPTIONS = { maximumFractionDigits: 0, roundingMode: "trunc" };

package/util/units.d.ts

@@ -41,9 +41,9 @@ export declare class Unit<K extends string> {
     /** Props to configure this unit. */
     { abbr, singular, plural, to }: UnitProps<K>);
     /** Convert an amount from this unit to another unit. */
-    to(amount: number, unit?: K | Unit<K>): number;
+    to(amount: number, units?: K): number;
     /** Convert an amount from another unit to this unit. */
-    from(amount: number, unit?: K | Unit<K>): number;
+    from(amount: number, units?: K): number;
     /** Convert an amount from this unit to another unit (must specify another `Unit` instance). */
     private _toUnit;
     /** Format an amount with a given unit of measure, e.g. `12 kg` or `29.5 l` */
@@ -61,16 +61,16 @@ export declare class UnitList<K extends string> extends ImmutableMap<K, Unit<K>>
     readonly base: Unit<K>;
     constructor(units: ImmutableObject<K, UnitProps<K>>);
     /** Convert an amount from a unit to another unit. */
-    convert(amount: number, sourceUnit: K | Unit<K>, targetUnit: K | Unit<K>): number;
+    convert(amount: number, sourceUnits: K, targetUnits: K): number;
     /**
      * Get a unit from this list.
      * @throws RequiredError if the unit is not found.
      */
-    unit(unit: K | Unit<K>): Unit<K>;
+    getUnit(units: K): Unit<K>;
 }
 /** Percentage units. */
-export declare const PERCENTAGE_UNITS: UnitList<"percent">;
-export type PercentageUnitKey = MapKey<typeof PERCENTAGE_UNITS>;
+export declare const PERCENT_UNITS: UnitList<"percent">;
+export type PercentUnitKey = MapKey<typeof PERCENT_UNITS>;
 /** Point units. */
 export declare const POINT_UNITS: UnitList<"basis-point" | "percentage-point">;
 export type PointUnitKey = MapKey<typeof POINT_UNITS>;

package/util/units.js

@@ -37,12 +37,12 @@ export class Unit {
         this._to = to;
     }
     /** Convert an amount from this unit to another unit. */
-    to(amount, unit = this.list.base) {
-        return this._toUnit(amount, this.list.unit(unit));
+    to(amount, units) {
+        return this._toUnit(amount, units ? this.list.getUnit(units) : this.list.base);
     }
     /** Convert an amount from another unit to this unit. */
-    from(amount, unit = this.list.base) {
-        return this.list.unit(unit)._toUnit(amount, this);
+    from(amount, units) {
+        return (units ? this.list.getUnit(units) : this.list.base)._toUnit(amount, this);
     }
     /** Convert an amount from this unit to another unit (must specify another `Unit` instance). */
     _toUnit(amount, unit) {
@@ -92,19 +92,17 @@ export class UnitList extends ImmutableMap {
         }
     }
     /** Convert an amount from a unit to another unit. */
-    convert(amount, sourceUnit, targetUnit) {
-        return this.unit(sourceUnit).to(amount, targetUnit);
+    convert(amount, sourceUnits, targetUnits) {
+        return this.getUnit(sourceUnits).to(amount, targetUnits);
     }
     /**
      * Get a unit from this list.
      * @throws RequiredError if the unit is not found.
      */
-    unit(unit) {
-        if (typeof unit !== "string")
-            return unit;
-        if (!this.has(unit))
-            throw new RequiredError(`Unit "${unit}" not found`);
-        return this.get(unit);
+    getUnit(units) {
+        if (this.has(units))
+            return this.get(units);
+        throw new RequiredError(`Unit "${units}" not found`);
     }
 }
 // Distance constants.
@@ -134,7 +132,7 @@ const ML_PER_IN3 = MM3_PER_IN3 / 1000;
 const US_IN3_PER_GAL = 231;
 const IMP_ML_PER_GAL = 4546090 / 1000;
 /** Percentage units. */
-export const PERCENTAGE_UNITS = new UnitList({
+export const PERCENT_UNITS = new UnitList({
     percent: { abbr: "%", plural: "percent" },
 });
 /** Point units. */

package/util/update.js

@@ -1,4 +1,3 @@
-import { AssertionError } from "../error/AssertionError.js";
 import { reduceItems } from "./iterate.js";
 import { getNumber } from "./number.js";
 import { getProps, isObject } from "./object.js";
@@ -34,6 +33,7 @@ function _updatePropDeep(obj, update, keys, i) {
     const oldValue = obj[k];
     let newValue = oldValue;
     if (i === keys.length - 1) {
+        // Final key.
         if (action === "sum")
             newValue = typeof oldValue === "number" ? oldValue + value : value;
         else if (action === "set")
@@ -42,9 +42,8 @@ function _updatePropDeep(obj, update, keys, i) {
             return action; // Never happens.
     }
     else {
-        if (!isObject(oldValue))
-            throw new AssertionError(`Prop "${keys.slice(0, i + 1).join(".")}" is not an object`);
-        newValue = _updatePropDeep(oldValue, update, keys, i + 1);
+        // Subkeys.
+        newValue = _updatePropDeep(isObject(oldValue) ? oldValue : {}, update, keys, i + 1);
     }
     return oldValue === newValue ? obj : { ...obj, [k]: newValue };
 }