@ic-reactor/core 3.1.3 → 3.1.4

package/dist/types/variant.d.ts

@@ -1,7 +1,9 @@
 export type IsCandidVariant<T> = [T] extends [CandidVariantToIntersection<T>] ? false : true;
 export type CandidVariantToIntersection<U> = (U extends object ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
-export type CandidVariantKey<T> = T extends any ? keyof T : never;
-export type CandidVariantValue<T, K extends CandidVariantKey<T>> = T extends Record<K, infer U> ? U : never;
+export type CandidVariantKey<T> = T extends any ? Exclude<keyof T, "_type"> : never;
+export type CandidVariantValue<T, K extends CandidVariantKey<T>> = T extends Record<K, infer U> ? U : T extends {
+    _type: K;
+} ? null : never;
 export type CandidVariant<T> = IsCandidVariant<T> extends true ? {
     _type: CandidVariantKey<T> & string;
 } & {

package/dist/types/variant.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"variant.d.ts","sourceRoot":"","sources":["../../src/types/variant.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC,GACzE,KAAK,GACL,IAAI,CAAA;AAER,MAAM,MAAM,2BAA2B,CAAC,CAAC,IAAI,CAC3C,CAAC,SAAS,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI,GAAG,KAAK,CAC1C,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,IAAI,GAC1B,CAAC,GACD,KAAK,CAAA;AAET,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI,CAAC,SAAS,GAAG,GAAG,MAAM,CAAC,GAAG,KAAK,CAAA;AAEjE,MAAM,MAAM,kBAAkB,CAAC,CAAC,EAAE,CAAC,SAAS,gBAAgB,CAAC,CAAC,CAAC,IAC7D,CAAC,SAAS,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;AAE1C,MAAM,MAAM,aAAa,CAAC,CAAC,IACzB,eAAe,CAAC,CAAC,CAAC,SAAS,IAAI,GAC3B;IACE,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,MAAM,CAAA;CACpC,GAAG;KACD,CAAC,IAAI,gBAAgB,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,kBAAkB,CACtD,CAAC,EACD,CAAC,CACF,SAAS,IAAI,GACV,KAAK,GACL,CAAC,GAAG,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC;CACjC,GACD,CAAC,CAAA;AAEP;;;GAGG;AACH,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,GAC7C;IACE,gBAAgB,CAAC,CAAC,CAAC,GAAG,MAAM;IAC5B,kBAAkB,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;CACpD,GACD,KAAK,CAAA"}
+{"version":3,"file":"variant.d.ts","sourceRoot":"","sources":["../../src/types/variant.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC,GACzE,KAAK,GACL,IAAI,CAAA;AAER,MAAM,MAAM,2BAA2B,CAAC,CAAC,IAAI,CAC3C,CAAC,SAAS,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI,GAAG,KAAK,CAC1C,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,IAAI,GAC1B,CAAC,GACD,KAAK,CAAA;AAET,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI,CAAC,SAAS,GAAG,GAC3C,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,GACzB,KAAK,CAAA;AAET,MAAM,MAAM,kBAAkB,CAAC,CAAC,EAAE,CAAC,SAAS,gBAAgB,CAAC,CAAC,CAAC,IAC7D,CAAC,SAAS,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS;IAAE,KAAK,EAAE,CAAC,CAAA;CAAE,GAAG,IAAI,GAAG,KAAK,CAAA;AAE1E,MAAM,MAAM,aAAa,CAAC,CAAC,IACzB,eAAe,CAAC,CAAC,CAAC,SAAS,IAAI,GAC3B;IACE,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,MAAM,CAAA;CACpC,GAAG;KACD,CAAC,IAAI,gBAAgB,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,kBAAkB,CACtD,CAAC,EACD,CAAC,CACF,SAAS,IAAI,GACV,KAAK,GACL,CAAC,GAAG,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC;CACjC,GACD,CAAC,CAAA;AAEP;;;GAGG;AACH,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,GAC7C;IACE,gBAAgB,CAAC,CAAC,CAAC,GAAG,MAAM;IAC5B,kBAAkB,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC;CACpD,GACD,KAAK,CAAA"}

package/dist/utils/candid.d.ts

@@ -15,21 +15,25 @@ export declare function createVariant<T extends Record<string, any>>(variant: T)
  * Extract variant key and value from a variant type
  * Works with types like:
  * type User = { 'Business': BusinessUser } | { 'Individual': IndividualUser }
+ * Also supports display variants shaped like:
+ * { _type: "Business", Business: value } or { _type: "Individual" }
  *
  * @template T - The variant type
  * @returns A tuple containing the key and value of the variant
- * @throws Error if the variant object does not have exactly one key
+ * @throws Error if the variant object is malformed
  */
 export declare function getVariantKeyValue<T extends Record<string, any>>(variant: T): CandidKeyValue<T>;
 /**
  * Extracts the key from a Candid variant type.
- * Variants in Candid are represented as objects with a single key-value pair.
+ * Supports both raw Candid variants ({ Ok: value }) and display variants
+ * ({ _type: "Ok", Ok: value }).
  * @param variant - The variant object
  * @returns The key of the variant
  */
 export declare function getVariantKey<T extends Record<string, any>>(variant: T): CandidVariantKey<T>;
 /**
  * Extracts the value from a Candid variant type.
+ * Supports both raw Candid variants and display variants.
  * @param variant - The variant object
  * @returns The value associated with the variant's key
  */

package/dist/utils/candid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"candid.d.ts","sourceRoot":"","sources":["../../src/utils/candid.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,kBAAkB,EAClB,cAAc,EACf,MAAM,UAAU,CAAA;AAEjB;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,CAE3E;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzD,OAAO,EAAE,CAAC,GACT,aAAa,CAAC,CAAC,CAAC,CAgBlB;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC9D,OAAO,EAAE,CAAC,GACT,cAAc,CAAC,CAAC,CAAC,CAUnB;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzD,OAAO,EAAE,CAAC,GACT,gBAAgB,CAAC,CAAC,CAAC,CAQrB;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC7B,CAAC,SAAS,gBAAgB,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,EACnD,OAAO,EAAE,CAAC,GAAG,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAEtC;AAED,wBAAgB,oBAAoB,CAClC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC7B,CAAC,SAAS,gBAAgB,CAAC,CAAC,CAAC,EAC7B,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAO9C;AAED,wBAAgB,iBAAiB,CAC/B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC7B,CAAC,SAAS,gBAAgB,CAAC,CAAC,CAAC,EAC7B,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,OAAO,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,CAEvD"}
+{"version":3,"file":"candid.d.ts","sourceRoot":"","sources":["../../src/utils/candid.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,kBAAkB,EAClB,cAAc,EACf,MAAM,UAAU,CAAA;AA4CjB;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,CAE3E;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzD,OAAO,EAAE,CAAC,GACT,aAAa,CAAC,CAAC,CAAC,CAgBlB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC9D,OAAO,EAAE,CAAC,GACT,cAAc,CAAC,CAAC,CAAC,CAEnB;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzD,OAAO,EAAE,CAAC,GACT,gBAAgB,CAAC,CAAC,CAAC,CAErB;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC7B,CAAC,SAAS,gBAAgB,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,EACnD,OAAO,EAAE,CAAC,GAAG,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAEtC;AAED,wBAAgB,oBAAoB,CAClC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC7B,CAAC,SAAS,gBAAgB,CAAC,CAAC,CAAC,EAC7B,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,CAQ9C;AAED,wBAAgB,iBAAiB,CAC/B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC7B,CAAC,SAAS,gBAAgB,CAAC,CAAC,CAAC,EAC7B,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,OAAO,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,CAEvD"}

package/dist/utils/candid.js

@@ -1,3 +1,27 @@
+const VARIANT_DISCRIMINATOR = "_type";
+function extractVariantDetails(variant) {
+    const keys = Object.keys(variant);
+    if (VARIANT_DISCRIMINATOR in variant &&
+        typeof variant[VARIANT_DISCRIMINATOR] === "string") {
+        const key = variant[VARIANT_DISCRIMINATOR];
+        const payloadKeys = keys.filter((item) => item !== VARIANT_DISCRIMINATOR);
+        if (payloadKeys.length > 1) {
+            throw new Error(`Invalid variant: must have at most one payload key when using ${VARIANT_DISCRIMINATOR}, found ${payloadKeys}`);
+        }
+        if (payloadKeys.length === 1 && payloadKeys[0] !== key) {
+            throw new Error(`Invalid variant: discriminator ${VARIANT_DISCRIMINATOR}=${key} does not match payload key ${payloadKeys[0]}`);
+        }
+        const value = (key in variant ? variant[key] : null);
+        return [key, value];
+    }
+    if (keys.length !== 1) {
+        const msg = `Invalid variant: must have exactly one key but found ${keys.length} keys: ${keys}`;
+        throw new Error(msg);
+    }
+    const key = keys[0];
+    const value = variant[key];
+    return [key, value];
+}
 /**
  * Creates a Candid variant from a string value.
  * @param str - The string to convert into a variant
@@ -29,47 +53,41 @@ export function createVariant(variant) {
  * Extract variant key and value from a variant type
  * Works with types like:
  * type User = { 'Business': BusinessUser } | { 'Individual': IndividualUser }
+ * Also supports display variants shaped like:
+ * { _type: "Business", Business: value } or { _type: "Individual" }
  *
  * @template T - The variant type
  * @returns A tuple containing the key and value of the variant
- * @throws Error if the variant object does not have exactly one key
+ * @throws Error if the variant object is malformed
  */
 export function getVariantKeyValue(variant) {
-    const keys = Object.keys(variant);
-    if (keys.length !== 1) {
-        const msg = `Invalid variant: must have exactly one key but found ${keys.length} keys: ${keys}`;
-        throw new Error(msg);
-    }
-    const key = keys[0];
-    const value = variant[key];
-    return [key, value];
+    return extractVariantDetails(variant);
 }
 /**
  * Extracts the key from a Candid variant type.
- * Variants in Candid are represented as objects with a single key-value pair.
+ * Supports both raw Candid variants ({ Ok: value }) and display variants
+ * ({ _type: "Ok", Ok: value }).
  * @param variant - The variant object
  * @returns The key of the variant
  */
 export function getVariantKey(variant) {
-    const keys = Object.keys(variant);
-    if (keys.length !== 1) {
-        throw new Error(`Invalid variant: must have exactly one key but found ${keys}`);
-    }
-    return keys[0];
+    return extractVariantDetails(variant)[0];
 }
 /**
  * Extracts the value from a Candid variant type.
+ * Supports both raw Candid variants and display variants.
  * @param variant - The variant object
  * @returns The value associated with the variant's key
  */
 export function getVariantValue(variant) {
-    return variant[getVariantKey(variant)];
+    return getVariantKeyValue(variant)[1];
 }
 export function getVariantValueByKey(variant, key) {
-    if (getVariantKey(variant) !== key) {
-        throw new Error(`Variant key mismatch: expected ${key}, got ${getVariantKey(variant)}`);
+    const [actualKey, value] = getVariantKeyValue(variant);
+    if (actualKey !== key) {
+        throw new Error(`Variant key mismatch: expected ${key}, got ${actualKey}`);
     }
-    return variant[key];
+    return value;
 }
 export function isKeyMatchVariant(variant, key) {
     return getVariantKey(variant) === key;

package/dist/utils/candid.js.map

@@ -1 +1 @@
-{"version":3,"file":"candid.js","sourceRoot":"","sources":["../../src/utils/candid.ts"],"names":[],"mappings":"AAOA;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAmB,GAAM;IACxD,OAAO,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,EAAqB,CAAA;AAC3C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAC3B,OAAU;IAEV,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACjC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC;6DACyC,IAAI,CAAC,MAAM,UAAU,IAAI,CAAC,GAAG,CAClF,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,EAAE,CACnC;KACF,CAAC,CAAA;IACJ,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAY,CAAA;IAC9B,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;IAE1B,OAAO;QACL,KAAK,EAAE,GAAG;QACV,GAAG,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACxB,CAAA;AACvB,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,kBAAkB,CAChC,OAAU;IAEV,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACjC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,MAAM,GAAG,GAAG,wDAAwD,IAAI,CAAC,MAAM,UAAU,IAAI,EAAE,CAAA;QAC/F,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;IACtB,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAyB,CAAA;IAC3C,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAyB,CAAA;IAElD,OAAO,CAAC,GAAG,EAAE,KAAK,CAAsB,CAAA;AAC1C,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAC3B,OAAU;IAEV,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACjC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CACb,wDAAwD,IAAI,EAAE,CAC/D,CAAA;IACH,CAAC;IACD,OAAO,IAAI,CAAC,CAAC,CAAwB,CAAA;AACvC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAG7B,OAAU;IACV,OAAO,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAA;AACxC,CAAC;AAED,MAAM,UAAU,oBAAoB,CAGlC,OAAU,EAAE,GAAM;IAClB,IAAI,aAAa,CAAC,OAAO,CAAC,KAAK,GAAG,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CACb,kCAAkC,GAAG,SAAS,aAAa,CAAC,OAAO,CAAC,EAAE,CACvE,CAAA;IACH,CAAC;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAA;AACrB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAG/B,OAAU,EAAE,GAAM;IAClB,OAAO,aAAa,CAAC,OAAO,CAAC,KAAK,GAAG,CAAA;AACvC,CAAC"}
+{"version":3,"file":"candid.js","sourceRoot":"","sources":["../../src/utils/candid.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ic-reactor/core",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "description": "IC Reactor Core Library",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/types/variant.ts

@@ -8,10 +8,12 @@ export type CandidVariantToIntersection<U> = (
   ? I
   : never
 
-export type CandidVariantKey<T> = T extends any ? keyof T : never
+export type CandidVariantKey<T> = T extends any
+  ? Exclude<keyof T, "_type">
+  : never
 
 export type CandidVariantValue<T, K extends CandidVariantKey<T>> =
-  T extends Record<K, infer U> ? U : never
+  T extends Record<K, infer U> ? U : T extends { _type: K } ? null : never
 
 export type CandidVariant<T> =
   IsCandidVariant<T> extends true

package/src/utils/candid.ts

@@ -5,6 +5,48 @@ import {
   CandidKeyValue,
 } from "../types"
 
+const VARIANT_DISCRIMINATOR = "_type"
+
+function extractVariantDetails<T extends Record<string, any>>(
+  variant: T
+): CandidKeyValue<T> {
+  const keys = Object.keys(variant)
+
+  if (
+    VARIANT_DISCRIMINATOR in variant &&
+    typeof variant[VARIANT_DISCRIMINATOR] === "string"
+  ) {
+    const key = variant[VARIANT_DISCRIMINATOR] as CandidKeyValue<T>[0]
+    const payloadKeys = keys.filter((item) => item !== VARIANT_DISCRIMINATOR)
+
+    if (payloadKeys.length > 1) {
+      throw new Error(
+        `Invalid variant: must have at most one payload key when using ${VARIANT_DISCRIMINATOR}, found ${payloadKeys}`
+      )
+    }
+
+    if (payloadKeys.length === 1 && payloadKeys[0] !== key) {
+      throw new Error(
+        `Invalid variant: discriminator ${VARIANT_DISCRIMINATOR}=${key} does not match payload key ${payloadKeys[0]}`
+      )
+    }
+
+    const value = (key in variant ? variant[key] : null) as CandidKeyValue<T>[1]
+
+    return [key, value] as CandidKeyValue<T>
+  }
+
+  if (keys.length !== 1) {
+    const msg = `Invalid variant: must have exactly one key but found ${keys.length} keys: ${keys}`
+    throw new Error(msg)
+  }
+
+  const key = keys[0] as CandidKeyValue<T>[0]
+  const value = variant[key] as CandidKeyValue<T>[1]
+
+  return [key, value] as CandidKeyValue<T>
+}
+
 /**
  * Creates a Candid variant from a string value.
  * @param str - The string to convert into a variant
@@ -43,45 +85,35 @@ export function createVariant<T extends Record<string, any>>(
  * Extract variant key and value from a variant type
  * Works with types like:
  * type User = { 'Business': BusinessUser } | { 'Individual': IndividualUser }
+ * Also supports display variants shaped like:
+ * { _type: "Business", Business: value } or { _type: "Individual" }
  *
  * @template T - The variant type
  * @returns A tuple containing the key and value of the variant
- * @throws Error if the variant object does not have exactly one key
+ * @throws Error if the variant object is malformed
  */
 export function getVariantKeyValue<T extends Record<string, any>>(
   variant: T
 ): CandidKeyValue<T> {
-  const keys = Object.keys(variant)
-  if (keys.length !== 1) {
-    const msg = `Invalid variant: must have exactly one key but found ${keys.length} keys: ${keys}`
-    throw new Error(msg)
-  }
-  const key = keys[0] as CandidKeyValue<T>[0]
-  const value = variant[key] as CandidKeyValue<T>[1]
-
-  return [key, value] as CandidKeyValue<T>
+  return extractVariantDetails(variant)
 }
 
 /**
  * Extracts the key from a Candid variant type.
- * Variants in Candid are represented as objects with a single key-value pair.
+ * Supports both raw Candid variants ({ Ok: value }) and display variants
+ * ({ _type: "Ok", Ok: value }).
  * @param variant - The variant object
  * @returns The key of the variant
  */
 export function getVariantKey<T extends Record<string, any>>(
   variant: T
 ): CandidVariantKey<T> {
-  const keys = Object.keys(variant)
-  if (keys.length !== 1) {
-    throw new Error(
-      `Invalid variant: must have exactly one key but found ${keys}`
-    )
-  }
-  return keys[0] as CandidVariantKey<T>
+  return extractVariantDetails(variant)[0] as CandidVariantKey<T>
 }
 
 /**
  * Extracts the value from a Candid variant type.
+ * Supports both raw Candid variants and display variants.
  * @param variant - The variant object
  * @returns The value associated with the variant's key
  */
@@ -89,19 +121,20 @@ export function getVariantValue<
   T extends Record<string, any>,
   K extends CandidVariantKey<T> = CandidVariantKey<T>,
 >(variant: T): CandidVariantValue<T, K> {
-  return variant[getVariantKey(variant)]
+  return getVariantKeyValue(variant)[1] as CandidVariantValue<T, K>
 }
 
 export function getVariantValueByKey<
   T extends Record<string, any>,
   K extends CandidVariantKey<T>,
 >(variant: T, key: K): CandidVariantValue<T, K> {
-  if (getVariantKey(variant) !== key) {
-    throw new Error(
-      `Variant key mismatch: expected ${key}, got ${getVariantKey(variant)}`
-    )
+  const [actualKey, value] = getVariantKeyValue(variant)
+
+  if (actualKey !== key) {
+    throw new Error(`Variant key mismatch: expected ${key}, got ${actualKey}`)
   }
-  return variant[key]
+
+  return value as CandidVariantValue<T, K>
 }
 
 export function isKeyMatchVariant<