fix: extend branding interface to unit-keys-value

Author: RebeccaStevens

src/core.ts

@@ -5,6 +5,7 @@ import type { Exponent } from "./exponents";
 import type {
   BrandUnitClass,
   BrandUnitClassType,
+  BrandUnitKeyValues,
   BrandUnitMeta,
   ExcludeUnitZeroSubvalues,
   RemoveNeverValues,
@@ -115,15 +116,12 @@ export type UnknownUnitMeta = UnknownUnitKeyValues &
     __uno_types__unit_meta_type: true;
   }>;
 
-type UnitKeyValues<T extends UnitSubvalues> = Readonly<{
-  __uom_types__keys: keyof ExcludeUnitZeroSubvalues<T> extends string ? keyof ExcludeUnitZeroSubvalues<T> : never;
-  __uom_types__value: RemoveNeverValues<T>;
-}>;
+type UnitKeyValues<T extends UnitSubvalues> = BrandUnitKeyValues<
+  keyof ExcludeUnitZeroSubvalues<T> extends string ? keyof ExcludeUnitZeroSubvalues<T> : never,
+  RemoveNeverValues<T>
+>;
 
-type UnknownUnitKeyValues = Readonly<{
-  __uom_types__keys: string;
-  __uom_types__value: {};
-}>;
+type UnknownUnitKeyValues = BrandUnitKeyValues<string, {}>;
 
 /**
  * A mapping of subvalue of a unit its magnitude.

src/units/modifiers/exponentials.ts

@@ -28,9 +28,9 @@ export type Square<
 > = T extends number
   ? Pow<T, 2>
   : T extends UnknownUnitClass
-    ? UnitClass<PowUnitSubvalues<T["__uom_types__value"], 2>>
+    ? UnitClass<PowUnitSubvalues<T["__uom_types"]["value"], 2>>
     : T extends UnknownUnitMeta
-      ? UnitMeta<PowUnitSubvalues<T["__uom_types__value"], 2>>
+      ? UnitMeta<PowUnitSubvalues<T["__uom_types"]["value"], 2>>
       : never;
 
 /**
@@ -46,9 +46,9 @@ export type Cubic<
 > = T extends number
   ? Pow<T, 3>
   : T extends UnknownUnitClass
-    ? UnitClass<PowUnitSubvalues<T["__uom_types__value"], 3>>
+    ? UnitClass<PowUnitSubvalues<T["__uom_types"]["value"], 3>>
     : T extends UnknownUnitMeta
-      ? UnitMeta<PowUnitSubvalues<T["__uom_types__value"], 3>>
+      ? UnitMeta<PowUnitSubvalues<T["__uom_types"]["value"], 3>>
       : never;
 
 // Tests

src/units/modifiers/reciprocal.ts

@@ -26,9 +26,9 @@ export type Reciprocal<
 > = T extends number
   ? Inverse<T>
   : T extends UnknownUnitClass
-    ? UnitClass<InverseUnitSubvalues<T["__uom_types__value"]>>
+    ? UnitClass<InverseUnitSubvalues<T["__uom_types"]["value"]>>
     : T extends UnknownUnitMeta
-      ? UnitMeta<InverseUnitSubvalues<T["__uom_types__value"]>>
+      ? UnitMeta<InverseUnitSubvalues<T["__uom_types"]["value"]>>
       : never;
 
 // Tests

src/utils.ts

@@ -36,6 +36,17 @@ export type BrandUnitClassType = Brand & {
   };
 };
 
+/**
+ * Brand with the unit keys and value.
+ */
+export type BrandUnitKeyValues<K, V> = Brand &
+  Readonly<{
+    __uom_types: {
+      keys: K;
+      value: V;
+    };
+  }>;
+
 /**
  * Remove all key from the object that are `never`.
  */