Skip to content

build: generate hyperapp wit files in two stages to improve type capture #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nick1udwig merged 1 commit into from
Aug 26, 2025
Merged

build: generate hyperapp wit files in two stages to improve type capture #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 26 additions & 3 deletions src/build/caller_utils_ts_generator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,16 @@ use tracing::{debug, info, instrument, warn};

use walkdir::WalkDir;

// Strip % prefix from WIT identifiers (used to escape keywords)
fn strip_wit_escape(s: &str) -> &str {
s.strip_prefix('%').unwrap_or(s)
}

// Convert kebab-case to camelCase
pub fn to_camel_case(s: &str) -> String {
// Strip % prefix if present
let s = strip_wit_escape(s);

let parts: Vec<&str> = s.split('-').collect();
if parts.is_empty() {
return String::new();
Expand All @@ -29,6 +37,9 @@ pub fn to_camel_case(s: &str) -> String {

// Convert kebab-case to PascalCase
pub fn to_pascal_case(s: &str) -> String {
// Strip % prefix if present
let s = strip_wit_escape(s);

let parts = s.split('-');
let mut result = String::new();

Expand Down Expand Up @@ -180,6 +191,9 @@ fn parse_wit_file(file_path: &Path) -> Result<WitTypes> {
.trim_end_matches(" {")
.trim();

// Strip % prefix if present
let record_name = strip_wit_escape(record_name);

if record_name.contains("-signature-") {
// This is a signature record
debug!(name = %record_name, "Found signature record");
Expand Down Expand Up @@ -212,7 +226,7 @@ fn parse_wit_file(file_path: &Path) -> Result<WitTypes> {
// Parse field definition
let field_parts: Vec<_> = field_line.split(':').collect();
if field_parts.len() == 2 {
let field_name = field_parts[0].trim().to_string();
let field_name = strip_wit_escape(field_parts[0].trim()).to_string();
let field_type = field_parts[1].trim().trim_end_matches(',').to_string();

debug!(name = %field_name, wit_type = %field_type, "Found field");
Expand Down Expand Up @@ -250,7 +264,7 @@ fn parse_wit_file(file_path: &Path) -> Result<WitTypes> {
// Parse field definition
let field_parts: Vec<_> = field_line.split(':').collect();
if field_parts.len() == 2 {
let field_name = field_parts[0].trim().to_string();
let field_name = strip_wit_escape(field_parts[0].trim()).to_string();
let field_type = field_parts[1].trim().trim_end_matches(',').to_string();

debug!(name = %field_name, wit_type = %field_type, "Found field");
Expand All @@ -275,6 +289,9 @@ fn parse_wit_file(file_path: &Path) -> Result<WitTypes> {
.trim_start_matches("variant ")
.trim_end_matches(" {")
.trim();

// Strip % prefix if present
let variant_name = strip_wit_escape(variant_name);
debug!(name = %variant_name, "Found variant");

// Parse cases
Expand All @@ -291,7 +308,13 @@ fn parse_wit_file(file_path: &Path) -> Result<WitTypes> {
}

// Parse case - just the name, ignoring any associated data for now
let case_name = case_line.trim_end_matches(',').to_string();
let case_raw = case_line.trim_end_matches(',');
// Extract case name (might have associated type in parentheses)
let case_name = if let Some(paren_pos) = case_raw.find('(') {
strip_wit_escape(&case_raw[..paren_pos]).to_string()
} else {
strip_wit_escape(case_raw).to_string()
};
debug!(case = %case_name, "Found variant case");
cases.push(case_name);

Expand Down
Loading