Refactor

Author: owjs3901

libs/extractor/src/utils.rs

@@ -197,16 +197,7 @@ pub(super) fn wrap_direct_call<'a>(
     expr: &Expression<'a>,
     args: &[Expression<'a>],
 ) -> Expression<'a> {
-    builder.expression_call::<Option<oxc_allocator::Box<'_, oxc_ast::ast::TSTypeParameterInstantiation<'_>>>>(
-        SPAN,
-        expr.clone_in(builder.allocator),
-        None,
-        oxc_allocator::Vec::from_iter_in(
-            args.iter().map(|e| e.clone_in(builder.allocator).into()),
-            builder.allocator,
-        ),
-        false,
-    )
+    builder.expression_call::<Option<oxc_allocator::Box<'_, oxc_ast::ast::TSTypeParameterInstantiation<'_>>>>(SPAN, expr.clone_in(builder.allocator), None, oxc_allocator::Vec::from_iter_in(args.iter().map(|e| e.clone_in(builder.allocator).into()), builder.allocator), false)
 }
 /// merge expressions to object expression
 pub(super) fn merge_object_expressions<'a>(

libs/sheet/src/theme.rs

@@ -218,34 +218,24 @@ impl<'de> Deserialize<'de> for Typographies {
         match &value {
             // Traditional array format: [{ fontFamily: "Arial", ... }, null, { ... }]
             Value::Array(arr) => {
-                // Check if this looks like a traditional typography array (array of objects/nulls)
-                // vs a compact format that accidentally starts with an array
-                let is_traditional = arr.iter().all(|v| v.is_object() || v.is_null());
-                if is_traditional {
-                    let mut result = Vec::with_capacity(arr.len());
-                    for item in arr {
-                        match item {
-                            Value::Null => result.push(None),
-                            Value::Object(_) => {
-                                let typo: Typography = serde_json::from_value(item.clone())
-                                    .map_err(D::Error::custom)?;
-                                result.push(Some(typo));
-                            }
-                            _ => {
-                                return Err(D::Error::custom(format!(
-                                    "Typography array must contain objects or null, got: {:?}",
-                                    item
-                                )));
-                            }
+                let mut result = Vec::with_capacity(arr.len());
+                for item in arr {
+                    match item {
+                        Value::Null => result.push(None),
+                        Value::Object(_) => {
+                            let typo: Typography =
+                                serde_json::from_value(item.clone()).map_err(D::Error::custom)?;
+                            result.push(Some(typo));
+                        }
+                        // Non-object/null values mean this is not a valid traditional array format
+                        _ => {
+                            return Err(D::Error::custom(
+                                "Typography value cannot start with an array. Use object format with property-level arrays instead.",
+                            ));
                         }
                     }
-                    Ok(Self(result))
-                } else {
-                    // Top-level array that's not a traditional format is an error
-                    Err(D::Error::custom(
-                        "Typography value cannot start with an array. Use object format with property-level arrays instead.",
-                    ))
                 }
+                Ok(Self(result))
             }
             // Compact object format: { fontFamily: "Arial", fontSize: ["16px", null, "20px"], ... }
             Value::Object(obj) => {