Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions .changepacks/changepack_log_portable_binding_state.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"changes": {
"bindings/devup-ui-wasm/package.json": "Patch",
"packages/components/package.json": "Patch"
},
"note": "Canonicalize complete exported property records, use portable content keyframe identities and short debug keyframe counters, and advance atomNamingVersion to 3. No new build errors.",
"date": "2026-10-20T00:00:00.000Z"
}
2 changes: 1 addition & 1 deletion bindings/devup-ui-wasm/src/cache_protocol_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ fn legacy_import_changes_cache_generation_when_exported(
assert_ne!(exported, legacy_json);
let json: serde_json::Value =
serde_json::from_str(&exported).unwrap_or_else(|error| panic!("{error}"));
assert_eq!(json["atomNamingVersion"], 2);
assert_eq!(json["atomNamingVersion"], 3);
let restored: StyleSheet =
serde_json::from_str(&exported).unwrap_or_else(|error| panic!("{error}"));
assert_eq!(restored.atom_plan, None);
Expand Down
6 changes: 4 additions & 2 deletions bindings/devup-ui-wasm/src/reservation/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,6 @@ fn debug_configuration_stays_unchanged_when_reserving() -> TestResult {
// Given
let (_reset, option) = setup(true);
css::debug::set_debug(true);
let before = css::class_map::get_class_map();
// When
reserve_class_slots_internal(
&[input("z.tsx", B), input("a.tsx", A)],
Expand All @@ -399,13 +398,16 @@ fn debug_configuration_stays_unchanged_when_reserving() -> TestResult {
);
// Then
assert!(css::debug::is_debug());
assert_eq!(css::class_map::get_class_map(), before);
let reserved = css::class_map::get_class_map();
assert_eq!(reserved[""].len(), 2);
assert_eq!(get_unreserved_class_slot_count(), 0);
assert!(
transform(&input("a.tsx", A), &option)?
.code
.contains("color-0-red")
);
assert_eq!(css::class_map::get_class_map(), reserved);
assert_eq!(get_unreserved_class_slot_count(), 0);
Ok(())
}

Expand Down
21 changes: 21 additions & 0 deletions libs/css/src/atom_counter_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,27 @@ use super::*;
use serial_test::serial;
use std::collections::{HashMap, HashSet};

#[rstest::rstest]
#[case(None, ["du-a", "du-b", "du-a"])]
#[case(Some("motion.tsx"), ["du-a-a", "du-a-b", "du-a-a"])]
#[serial]
fn ordinary_debug_keyframes_use_the_same_short_counters(
#[case] filename: Option<&str>,
#[case] expected: [&str; 3],
) {
for debug in [false, true] {
// Given
let _state = test_state::TestStateGuard::new();
set_prefix(Some("du-".into()));
debug::set_debug(debug);
// When
let names =
["frames", "other", "frames"].map(|key| keyframes_to_keyframes_name(key, filename));
// Then
assert_eq!(names, expected);
}
}

fn setup() {
class_map::reset_class_map();
file_map::reset_file_map();
Expand Down
46 changes: 19 additions & 27 deletions libs/css/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -461,34 +461,26 @@ pub fn keyframes_to_keyframes_name(keyframes: &str, filename: Option<&str>) -> S
);
}
with_prefix(|prefix| {
if is_debug() {
let mut result = String::with_capacity(prefix.len() + 2 + keyframes.len());
let filename_key = filename.unwrap_or_default();
let class_num = class_num_for_key(filename_key, |key| {
key.reserve(2 + keyframes.len());
key.push_str("k-");
key.push_str(keyframes);
});
if let Some(fname) = filename {
let file_num = num_to_nm_base(get_file_num_by_filename(fname));
let mut result =
String::with_capacity(prefix.len() + file_num.len() + 1 + class_num.len());
result.push_str(prefix);
result.push_str("k-");
result.push_str(keyframes);
result.push_str(&file_num);
result.push('-');
result.push_str(&class_num);
result
} else {
let filename_key = filename.unwrap_or_default();
let class_num = class_num_for_key(filename_key, |key| {
key.reserve(2 + keyframes.len());
key.push_str("k-");
key.push_str(keyframes);
});
if let Some(fname) = filename {
let file_num = num_to_nm_base(get_file_num_by_filename(fname));
let mut result =
String::with_capacity(prefix.len() + file_num.len() + 1 + class_num.len());
result.push_str(prefix);
result.push_str(&file_num);
result.push('-');
result.push_str(&class_num);
result
} else {
let mut result = String::with_capacity(prefix.len() + class_num.len());
result.push_str(prefix);
result.push_str(&class_num);
result
}
let mut result = String::with_capacity(prefix.len() + class_num.len());
result.push_str(prefix);
result.push_str(&class_num);
result
}
})
}
Expand Down Expand Up @@ -1330,8 +1322,8 @@ mod tests {
);
reset_class_map();
set_debug(true);
assert_eq!(keyframes_to_keyframes_name("spin", None), "k-spin");
assert_eq!(keyframes_to_keyframes_name("spin1", None), "k-spin1");
assert_eq!(keyframes_to_keyframes_name("spin", None), "a");
assert_eq!(keyframes_to_keyframes_name("spin1", None), "b");
}

#[test]
Expand Down
Loading
Loading