uom-types 4.1.0 → 4.1.1

package/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
+## [4.1.1](https://github.com/RebeccaStevens/uom-types/compare/v4.1.0...v4.1.1) (2024-10-18)
+
+
+### Bug Fixes
+
+* improve handling of unitless with pow/root functions ([ad44cf3](https://github.com/RebeccaStevens/uom-types/commit/ad44cf3accf48207391c2d55b7c10f723b0dad19))
+
 # [4.1.0](https://github.com/RebeccaStevens/uom-types/compare/v4.0.1...v4.1.0) (2024-10-18)
 
 

package/dist/index.d.cts

@@ -270,28 +270,28 @@ export type DivideUnitSubvalues<A extends UnitSubvalues, B extends UnitSubvalues
  *
  * @group Unit Functions
  */
-export type Pow<T extends number, N extends Exponent> = T extends Unit<infer Class, infer Meta> ? Unit<FlatternAlias<PowUnitSubvalues<Class, N>>, FlatternAlias<PowUnitSubvalues<Meta, N>>> : T extends AbstractUnit<infer Class> ? AbstractUnit<FlatternAlias<PowUnitSubvalues<Class, N>>> : T extends UnitConversionRate<infer Meta> ? UnitConversionRate<FlatternAlias<PowUnitSubvalues<Meta, N>>> : number;
+export type Pow<B extends number, E extends Exponent> = B extends Unit<infer Class, infer Meta> ? Unit<FlatternAlias<PowUnitSubvalues<Class, E>>, FlatternAlias<PowUnitSubvalues<Meta, E>>> : B extends AbstractUnit<infer Class> ? AbstractUnit<FlatternAlias<PowUnitSubvalues<Class, E>>> : B extends UnitConversionRate<infer Meta> ? UnitConversionRate<FlatternAlias<PowUnitSubvalues<Meta, E>>> : number;
 /**
  * Put each subvalue of a unit to the power of an exponent.
  *
  * @group Unit Subvalue Functions
  */
-export type PowUnitSubvalues<T extends UnitSubvalues, E extends Exponent> = ExcludeUnitZeroSubvalues<{
-	[S in keyof T]: MultiplyExponents<GetExponent<T, S>, E>;
+export type PowUnitSubvalues<B extends UnitSubvalues, E extends Exponent> = ExcludeUnitZeroSubvalues<{
+	[S in keyof B]: MultiplyExponents<GetExponent<B, S>, E>;
 }>;
 /**
  * Take the nth root of a unit.
  *
  * @group Unit Functions
  */
-export type Root<T extends number, N extends Exponent> = T extends Unit<infer Class, infer Meta> ? Unit<FlatternAlias<RootUnitSubvalues<Class, N>>, FlatternAlias<RootUnitSubvalues<Meta, N>>> : T extends AbstractUnit<infer Class> ? AbstractUnit<FlatternAlias<RootUnitSubvalues<Class, N>>> : T extends UnitConversionRate<infer Meta> ? UnitConversionRate<FlatternAlias<RootUnitSubvalues<Meta, N>>> : number;
+export type Root<B extends number, E extends Exponent> = B extends Unit<infer Class, infer Meta> ? Unit<FlatternAlias<RootUnitSubvalues<Class, E>>, FlatternAlias<RootUnitSubvalues<Meta, E>>> : B extends AbstractUnit<infer Class> ? AbstractUnit<FlatternAlias<RootUnitSubvalues<Class, E>>> : B extends UnitConversionRate<infer Meta> ? UnitConversionRate<FlatternAlias<RootUnitSubvalues<Meta, E>>> : number;
 /**
  * Take the nth root of each subvalue of a unit.
  *
  * @group Unit Subvalue Functions
  */
-export type RootUnitSubvalues<T extends UnitSubvalues, E extends Exponent> = ExcludeUnitZeroSubvalues<{
-	[S in keyof T]: DivideExponents<GetExponent<T, S>, E>;
+export type RootUnitSubvalues<B extends UnitSubvalues, E extends Exponent> = ExcludeUnitZeroSubvalues<{
+	[S in keyof B]: DivideExponents<GetExponent<B, S>, E>;
 }>;
 export type SiUnitKeys = "Second" | "Meter" | "Kilogram" | "Mole" | "Ampere" | "Candela" | "Kelvin" | "Radian";
 /**
@@ -4268,43 +4268,38 @@ export declare function modSafe<T extends number>(a: OperationIO<T>, b: Operatio
  * @returns A function that takes a integer and returns an integer between zero (inclusive) and `b` (exclusive).
  */
 export declare function modSafe<T extends number>(b: OperationIO<T>): (a: OperationIO<T>) => OperationIO<T>;
-export type PowFunction<E extends number, B extends number> = E extends UnknownUnit ? never : E extends UnknownAbstractUnit ? never : E extends Exponent ? (b: B) => Pow<B, E> : E extends 0.5 ? (b: B) => Root<B, 2> : (b: B) => number;
+export type PowResult<B extends number, E extends number> = E extends Unitless ? PowResult<B, number> : E extends UnknownUnit ? never : E extends UnknownAbstractUnit ? never : E extends Exponent ? Pow<B, E> : E extends 0.5 ? Root<B, 2> : B extends Unitless ? B : number;
+export type PowFunction<B extends number, E extends number> = (b: B) => PowResult<B, E>;
+export type RootResult<B extends number, E extends number> = E extends Unitless ? RootResult<B, number> : E extends UnknownUnit ? never : E extends UnknownAbstractUnit ? never : E extends Exponent ? Root<B, E> : E extends 0.5 ? Pow<B, 2> : B extends Unitless ? B : number;
+export type RootFunction<B extends number, E extends number> = (b: B) => RootResult<B, E>;
 /**
  * Raise a number to the power of another.
  *
  * @category Math
  * @returns `base ** exponent`
  */
-export declare function pow<B extends number, E extends number>(base: B, exponent: E extends UnknownUnit ? never : E extends UnknownAbstractUnit ? never : E): E extends Exponent ? Pow<B, E> : number;
-/**
- * Put a number to the power of 1/2.
- *
- * @category Math
- * @returns `base ** 0.5`
- */
-export declare function pow<B extends number>(base: B, exponent: 0.5): Root<B, 2>;
+export declare function pow<B extends number, E extends number>(base: B, exponent: E): PowResult<B, E>;
 /**
  * Put a number to the power of the given value.
  *
  * @category Math
  * @returns `(base) => base ** exponent`
  */
-export declare function pow<E extends number>(exponent: E): <B extends number>(base: Parameters<PowFunction<E, B>>[0]) => ReturnType<PowFunction<E, B>>;
-export type RootFunction<E extends number, B extends number> = E extends UnknownUnit ? never : E extends UnknownAbstractUnit ? never : E extends PosExponent ? (b: B) => Root<B, E> : (b: B) => number;
+export declare function pow<E extends number>(exponent: E): <B extends number>(base: Parameters<PowFunction<B, E>>[0]) => ReturnType<PowFunction<B, E>>;
 /**
  * Take the nth root of a number.
  *
  * @category Math
  * @returns `base ** (1 / exponent)`
  */
-export declare function root<B extends number, E extends number>(base: B, exponent: E extends UnknownUnit ? never : E extends UnknownAbstractUnit ? never : E): E extends PosExponent ? Root<B, E> : number;
+export declare function root<B extends number, E extends number>(base: B, exponent: E): RootResult<B, E>;
 /**
  * Take the nth root of a number.
  *
  * @category Math
  * @returns `(base) => base ** (1 / exponent)`
  */
-export declare function root<E extends number>(exponent: E): <B extends number>(base: Parameters<RootFunction<E, B>>[0]) => ReturnType<RootFunction<E, B>>;
+export declare function root<E extends number>(exponent: E): <B extends number>(base: Parameters<RootFunction<B, E>>[0]) => ReturnType<RootFunction<B, E>>;
 /**
  * Take the square root of the given value.
  *

package/dist/index.d.mts

@@ -270,28 +270,28 @@ export type DivideUnitSubvalues<A extends UnitSubvalues, B extends UnitSubvalues
  *
  * @group Unit Functions
  */
-export type Pow<T extends number, N extends Exponent> = T extends Unit<infer Class, infer Meta> ? Unit<FlatternAlias<PowUnitSubvalues<Class, N>>, FlatternAlias<PowUnitSubvalues<Meta, N>>> : T extends AbstractUnit<infer Class> ? AbstractUnit<FlatternAlias<PowUnitSubvalues<Class, N>>> : T extends UnitConversionRate<infer Meta> ? UnitConversionRate<FlatternAlias<PowUnitSubvalues<Meta, N>>> : number;
+export type Pow<B extends number, E extends Exponent> = B extends Unit<infer Class, infer Meta> ? Unit<FlatternAlias<PowUnitSubvalues<Class, E>>, FlatternAlias<PowUnitSubvalues<Meta, E>>> : B extends AbstractUnit<infer Class> ? AbstractUnit<FlatternAlias<PowUnitSubvalues<Class, E>>> : B extends UnitConversionRate<infer Meta> ? UnitConversionRate<FlatternAlias<PowUnitSubvalues<Meta, E>>> : number;
 /**
  * Put each subvalue of a unit to the power of an exponent.
  *
  * @group Unit Subvalue Functions
  */
-export type PowUnitSubvalues<T extends UnitSubvalues, E extends Exponent> = ExcludeUnitZeroSubvalues<{
-	[S in keyof T]: MultiplyExponents<GetExponent<T, S>, E>;
+export type PowUnitSubvalues<B extends UnitSubvalues, E extends Exponent> = ExcludeUnitZeroSubvalues<{
+	[S in keyof B]: MultiplyExponents<GetExponent<B, S>, E>;
 }>;
 /**
  * Take the nth root of a unit.
  *
  * @group Unit Functions
  */
-export type Root<T extends number, N extends Exponent> = T extends Unit<infer Class, infer Meta> ? Unit<FlatternAlias<RootUnitSubvalues<Class, N>>, FlatternAlias<RootUnitSubvalues<Meta, N>>> : T extends AbstractUnit<infer Class> ? AbstractUnit<FlatternAlias<RootUnitSubvalues<Class, N>>> : T extends UnitConversionRate<infer Meta> ? UnitConversionRate<FlatternAlias<RootUnitSubvalues<Meta, N>>> : number;
+export type Root<B extends number, E extends Exponent> = B extends Unit<infer Class, infer Meta> ? Unit<FlatternAlias<RootUnitSubvalues<Class, E>>, FlatternAlias<RootUnitSubvalues<Meta, E>>> : B extends AbstractUnit<infer Class> ? AbstractUnit<FlatternAlias<RootUnitSubvalues<Class, E>>> : B extends UnitConversionRate<infer Meta> ? UnitConversionRate<FlatternAlias<RootUnitSubvalues<Meta, E>>> : number;
 /**
  * Take the nth root of each subvalue of a unit.
  *
  * @group Unit Subvalue Functions
  */
-export type RootUnitSubvalues<T extends UnitSubvalues, E extends Exponent> = ExcludeUnitZeroSubvalues<{
-	[S in keyof T]: DivideExponents<GetExponent<T, S>, E>;
+export type RootUnitSubvalues<B extends UnitSubvalues, E extends Exponent> = ExcludeUnitZeroSubvalues<{
+	[S in keyof B]: DivideExponents<GetExponent<B, S>, E>;
 }>;
 export type SiUnitKeys = "Second" | "Meter" | "Kilogram" | "Mole" | "Ampere" | "Candela" | "Kelvin" | "Radian";
 /**
@@ -4268,43 +4268,38 @@ export declare function modSafe<T extends number>(a: OperationIO<T>, b: Operatio
  * @returns A function that takes a integer and returns an integer between zero (inclusive) and `b` (exclusive).
  */
 export declare function modSafe<T extends number>(b: OperationIO<T>): (a: OperationIO<T>) => OperationIO<T>;
-export type PowFunction<E extends number, B extends number> = E extends UnknownUnit ? never : E extends UnknownAbstractUnit ? never : E extends Exponent ? (b: B) => Pow<B, E> : E extends 0.5 ? (b: B) => Root<B, 2> : (b: B) => number;
+export type PowResult<B extends number, E extends number> = E extends Unitless ? PowResult<B, number> : E extends UnknownUnit ? never : E extends UnknownAbstractUnit ? never : E extends Exponent ? Pow<B, E> : E extends 0.5 ? Root<B, 2> : B extends Unitless ? B : number;
+export type PowFunction<B extends number, E extends number> = (b: B) => PowResult<B, E>;
+export type RootResult<B extends number, E extends number> = E extends Unitless ? RootResult<B, number> : E extends UnknownUnit ? never : E extends UnknownAbstractUnit ? never : E extends Exponent ? Root<B, E> : E extends 0.5 ? Pow<B, 2> : B extends Unitless ? B : number;
+export type RootFunction<B extends number, E extends number> = (b: B) => RootResult<B, E>;
 /**
  * Raise a number to the power of another.
  *
  * @category Math
  * @returns `base ** exponent`
  */
-export declare function pow<B extends number, E extends number>(base: B, exponent: E extends UnknownUnit ? never : E extends UnknownAbstractUnit ? never : E): E extends Exponent ? Pow<B, E> : number;
-/**
- * Put a number to the power of 1/2.
- *
- * @category Math
- * @returns `base ** 0.5`
- */
-export declare function pow<B extends number>(base: B, exponent: 0.5): Root<B, 2>;
+export declare function pow<B extends number, E extends number>(base: B, exponent: E): PowResult<B, E>;
 /**
  * Put a number to the power of the given value.
  *
  * @category Math
  * @returns `(base) => base ** exponent`
  */
-export declare function pow<E extends number>(exponent: E): <B extends number>(base: Parameters<PowFunction<E, B>>[0]) => ReturnType<PowFunction<E, B>>;
-export type RootFunction<E extends number, B extends number> = E extends UnknownUnit ? never : E extends UnknownAbstractUnit ? never : E extends PosExponent ? (b: B) => Root<B, E> : (b: B) => number;
+export declare function pow<E extends number>(exponent: E): <B extends number>(base: Parameters<PowFunction<B, E>>[0]) => ReturnType<PowFunction<B, E>>;
 /**
  * Take the nth root of a number.
  *
  * @category Math
  * @returns `base ** (1 / exponent)`
  */
-export declare function root<B extends number, E extends number>(base: B, exponent: E extends UnknownUnit ? never : E extends UnknownAbstractUnit ? never : E): E extends PosExponent ? Root<B, E> : number;
+export declare function root<B extends number, E extends number>(base: B, exponent: E): RootResult<B, E>;
 /**
  * Take the nth root of a number.
  *
  * @category Math
  * @returns `(base) => base ** (1 / exponent)`
  */
-export declare function root<E extends number>(exponent: E): <B extends number>(base: Parameters<RootFunction<E, B>>[0]) => ReturnType<RootFunction<E, B>>;
+export declare function root<E extends number>(exponent: E): <B extends number>(base: Parameters<RootFunction<B, E>>[0]) => ReturnType<RootFunction<B, E>>;
 /**
  * Take the square root of the given value.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uom-types",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "description": "Typesafe units with no runtime overhead.",
   "keywords": [
     "uom",