@ic-reactor/candid 3.0.13-beta.0 → 3.0.14-beta.1

package/src/visitor/constants.ts

@@ -30,27 +30,36 @@ const CYCLE_KEYS_REGEX = new RegExp(
   "i"
 )
 
-const EMAIL_KEYS_REGEX = /email|mail/i
-const PHONE_KEYS_REGEX = /phone|tel|mobile/i
-const URL_KEYS_REGEX = /url|link|website/i
-const UUID_KEYS_REGEX = /uuid|guid/i
-const BITCOIN_KEYS_REGEX = /bitcoin|btc/i
-const ETHEREUM_KEYS_REGEX = /ethereum|eth/i
 const ACCOUNT_ID_KEYS_REGEX =
-  /account_id|account_identifier|ledger_account|block_hash|transaction_hash|tx_hash/i
-const PRINCIPAL_KEYS_REGEX = /canister|principal/i
+  /account_identifier|ledger_account|block_hash|transaction_hash|tx_hash/i
+
+const tokenize = (label: string): Set<string> => {
+  const parts = label
+    .replace(/_/g, " ")
+    .replace(/([a-z])([A-Z])/g, "$1 $2")
+    .toLowerCase()
+    .split(/[\s-]+/)
+  return new Set(parts)
+}
 
 export const checkTextFormat = (label?: string): TextFormat => {
   if (!label) return "plain"
+
   if (TAMESTAMP_KEYS_REGEX.test(label)) return "timestamp"
-  if (EMAIL_KEYS_REGEX.test(label)) return "email"
-  if (PHONE_KEYS_REGEX.test(label)) return "phone"
-  if (URL_KEYS_REGEX.test(label)) return "url"
-  if (UUID_KEYS_REGEX.test(label)) return "uuid"
-  if (BITCOIN_KEYS_REGEX.test(label)) return "btc"
-  if (ETHEREUM_KEYS_REGEX.test(label)) return "eth"
   if (ACCOUNT_ID_KEYS_REGEX.test(label)) return "account-id"
-  if (PRINCIPAL_KEYS_REGEX.test(label)) return "principal"
+
+  const tokens = tokenize(label)
+
+  if (tokens.has("email") || tokens.has("mail")) return "email"
+  if (tokens.has("phone") || tokens.has("tel") || tokens.has("mobile"))
+    return "phone"
+  if (tokens.has("url") || tokens.has("link") || tokens.has("website"))
+    return "url"
+  if (tokens.has("uuid") || tokens.has("guid")) return "uuid"
+  if (tokens.has("btc") || tokens.has("bitcoin")) return "btc"
+  if (tokens.has("eth") || tokens.has("ethereum")) return "eth"
+  if (tokens.has("principal") || tokens.has("canister")) return "principal"
+
   return "plain"
 }
 

package/src/visitor/returns/index.test.ts

@@ -58,7 +58,7 @@ describe("ResultFieldVisitor", () => {
       const ethField = visitor.visitText(IDL.Text, "ethereum_address")
       expect(ethField.format).toBe("eth")
 
-      const accountIdField = visitor.visitText(IDL.Text, "account_id")
+      const accountIdField = visitor.visitText(IDL.Text, "account_identifier")
       expect(accountIdField.format).toBe("account-id")
 
       const principalField = visitor.visitText(IDL.Text, "canister_id")

package/src/visitor/returns/types.ts

@@ -4,25 +4,15 @@ import type {
   FunctionType,
   ActorMethodReturnType,
 } from "@ic-reactor/core"
+import type { VisitorDataType, TextFormat, NumberFormat } from "../types"
+
+export type { TextFormat, NumberFormat }
 
 // ════════════════════════════════════════════════════════════════════════════
 // Core Types & Formats
 // ════════════════════════════════════════════════════════════════════════════
 
-export type NodeType =
-  | "record"
-  | "variant"
-  | "tuple"
-  | "optional"
-  | "vector"
-  | "blob"
-  | "recursive"
-  | "principal"
-  | "number"
-  | "text"
-  | "boolean"
-  | "null"
-  | "unknown"
+export type NodeType = VisitorDataType
 
 export type DisplayType =
   | "string"
@@ -38,19 +28,6 @@ export type DisplayType =
   | "blob"
   | "unknown"
 
-export type NumberFormat = "timestamp" | "cycle" | "value" | "token" | "normal"
-export type TextFormat =
-  | "plain"
-  | "timestamp"
-  | "uuid"
-  | "url"
-  | "email"
-  | "phone"
-  | "btc"
-  | "eth"
-  | "account-id"
-  | "principal"
-
 // ════════════════════════════════════════════════════════════════════════════
 // Unified Result Node - Single Structure for Schema & Resolved Data
 // ════════════════════════════════════════════════════════════════════════════

package/src/visitor/types.ts

@@ -26,3 +26,48 @@ export type AllNumberTypes =
   | IDL.FixedNatClass
   | IDL.FixedIntClass
   | IDL.FloatClass
+
+// ════════════════════════════════════════════════════════════════════════════
+// Shared Types for Visitors (Arguments & Returns)
+// ════════════════════════════════════════════════════════════════════════════
+
+/**
+ * The core Candid type category used across visitors.
+ */
+export type VisitorDataType =
+  | "record"
+  | "variant"
+  | "tuple"
+  | "optional"
+  | "vector"
+  | "blob"
+  | "recursive"
+  | "principal"
+  | "number"
+  | "text"
+  | "boolean"
+  | "null"
+  | "unknown"
+
+/**
+ * Detected format for text fields based on label heuristics.
+ * Used to provide format-specific validation and display.
+ */
+export type TextFormat =
+  | "plain"
+  | "timestamp"
+  | "uuid"
+  | "url"
+  | "email"
+  | "phone"
+  | "btc"
+  | "eth"
+  | "account-id"
+  | "principal"
+  | "cycle"
+
+/**
+ * Detected format for number fields based on label heuristics.
+ * Used to provide format-specific validation and display.
+ */
+export type NumberFormat = "timestamp" | "cycle" | "value" | "token" | "normal"