#60 fix hex, oct and binary numbers (#71)

* feat: add parse_number_autoradix utility and update enum handling

* Add new test to test_all.sh

Author: AskSkivdal

src/to_typescript/enums.rs

@@ -1,3 +1,4 @@
+use crate::utils::parse_number_autoradix;
 use crate::{typescript::convert_type, utils, BuildState};
 use convert_case::{Case, Casing};
 use syn::__private::ToTokens;
@@ -151,7 +152,7 @@ fn add_numeric_enum(
             variant.ident.unraw().to_string()
         };
         if let Some((_, disc)) = variant.discriminant {
-            if let Ok(new_disc) = disc.to_token_stream().to_string().parse::<i32>() {
+            if let Some(new_disc) = parse_number_autoradix(disc.to_token_stream().to_string()) {
                 num = new_disc;
             }
         }

src/utils.rs

@@ -273,3 +273,30 @@ pub(crate) fn parse_serde_case(
             .map(|(_, rule)| *rule)
     })
 }
+
+/// Parse a number automaticly handling radix like rust does.
+/// 0x - Hex notation
+/// 0o - Octal notation
+/// 0b - Binary notation
+pub fn parse_number_autoradix(input: String) -> Option<i32> {
+    let normalized = input.to_lowercase().replace("_", "");
+    let trimmed = normalized.trim();
+
+    if let Some(hex) = trimmed.strip_prefix("0x") {
+        i32::from_str_radix(&hex, 16).ok()
+    } else if let Some(oct) = trimmed.strip_prefix("0o") {
+        i32::from_str_radix(&oct, 8).ok()
+    } else if let Some(bin) = trimmed.strip_prefix("0b") {
+        i32::from_str_radix(&bin, 2).ok()
+    } else {
+        trimmed.parse::<i32>().ok()
+    }
+}
+
+#[test]
+fn test_parse_number() {
+    assert_eq!(parse_number_autoradix("2_3".into()), Some(23));
+    assert_eq!(parse_number_autoradix("0xf".into()), Some(15));
+    assert_eq!(parse_number_autoradix("0b11".into()), Some(3));
+    assert_eq!(parse_number_autoradix("0o1_1".into()), Some(0o1_1));
+}

test/issue-60/rust.rs

@@ -0,0 +1,39 @@
+#[derive(Serialize_repr)]
+#[repr(u16)]
+#[tsync]
+pub enum KeyCode {
+    Space = 32,
+    Apostrophe = 39,
+    Comma = 44,
+    Minus = 45,
+}
+
+#[derive(Serialize_repr)]
+#[repr(u16)]
+#[tsync]
+pub enum KeyCodeHex {
+    Space = 0x0020,
+    Apostrophe = 0x0027,
+    Comma = 0x002c,
+    Minus = 0x002d,
+}
+
+#[derive(Serialize_repr)]
+#[repr(u16)]
+#[tsync]
+pub enum KeyCodeOct {
+    Space = 0o40,
+    Apostrophe = 0o47,
+    Comma = 0o54,
+    Minus = 0o55,
+}
+
+#[derive(Serialize_repr)]
+#[repr(u16)]
+#[tsync]
+pub enum KeyCodeBin {
+    Space = 0b100000,
+    Apostrophe = 0b100111,
+    Comma = 0b101100,
+    Minus = 0b101101,
+}

test/issue-60/tsync.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+
+cd $SCRIPT_DIR
+
+cargo run -- -i rust.rs -o typescript.d.ts
+cargo run -- -i rust.rs -o typescript.ts

test/issue-60/typescript.d.ts

@@ -0,0 +1,29 @@
+/* This file is generated and managed by tsync */
+
+declare enum KeyCode {
+  Space = 32,
+  Apostrophe = 39,
+  Comma = 44,
+  Minus = 45,
+}
+
+declare enum KeyCodeHex {
+  Space = 32,
+  Apostrophe = 39,
+  Comma = 44,
+  Minus = 45,
+}
+
+declare enum KeyCodeOct {
+  Space = 32,
+  Apostrophe = 39,
+  Comma = 44,
+  Minus = 45,
+}
+
+declare enum KeyCodeBin {
+  Space = 32,
+  Apostrophe = 39,
+  Comma = 44,
+  Minus = 45,
+}

test/issue-60/typescript.ts

@@ -0,0 +1,29 @@
+/* This file is generated and managed by tsync */
+
+export enum KeyCode {
+  Space = 32,
+  Apostrophe = 39,
+  Comma = 44,
+  Minus = 45,
+}
+
+export enum KeyCodeHex {
+  Space = 32,
+  Apostrophe = 39,
+  Comma = 44,
+  Minus = 45,
+}
+
+export enum KeyCodeOct {
+  Space = 32,
+  Apostrophe = 39,
+  Comma = 44,
+  Minus = 45,
+}
+
+export enum KeyCodeBin {
+  Space = 32,
+  Apostrophe = 39,
+  Comma = 44,
+  Minus = 45,
+}

test/test_all.sh

@@ -17,6 +17,7 @@ cd $SCRIPT_DIR
 ./issue-43/tsync.sh
 ./issue-55/tsync.sh
 ./issue-58/tsync.sh
+./issue-60/tsync.sh
 ./issue-63/tsync.sh
 ./issue-65-untagged-enums/tsync.sh
 ./raw_identifiers/tsync.sh