Miscellaneous updates

- Improve sanitization of variable values.
- Update toList() parsing to not remove null values.

Author: BirjuVachhani

lib/src/api/models/color_rgba.dart

@@ -111,6 +111,15 @@ class ColorRGBA with EquatableMixin, SerializableMixin {
     );
   }
 
+  /// Converts this [ColorRGBA] to [ColorRGB] by removing the alpha channel.
+  String toHex() {
+    final r = (this.r * 255).toInt().toRadixString(16).padLeft(2, '0');
+    final g = (this.g * 255).toInt().toRadixString(16).padLeft(2, '0');
+    final b = (this.b * 255).toInt().toRadixString(16).padLeft(2, '0');
+    final a = (this.a * 255).toInt().toRadixString(16).padLeft(2, '0');
+    return '#$a$r$g$b'.toUpperCase();
+  }
+
   @override
   Map toJson() => _$ColorRGBAToJson(this);
 

lib/src/api/models/variables_model.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:equatable/equatable.dart';
 import 'package:json_annotation/json_annotation.dart';
 
@@ -76,7 +78,7 @@ class VariableData
   VariableData copyWith({
     String? id,
     String? name,
-    String? value,
+    Object? value,
     VariableType? type,
     bool? isUsed,
     Set<String>? nodes,
@@ -128,24 +130,43 @@ class VariableData
 }
 
 /// Returns the value converted to the appropriate type according to [type].
-String? sanitizeValueForVariableType(String? value, VariableType type) {
+/// Supported color values:
+/// - ColorRGBA
+/// - ColorRGB
+/// - Hex color string
+/// - Flutter Color object
+String? sanitizeValueForVariableType(Object? value, VariableType type) {
   if (value == null) return null;
-  if (value.isEmpty) return '';
-  return switch (type) {
-    VariableType.text => value,
-    VariableType.integer => num.tryParse(value).toInt()?.toString(),
-    VariableType.decimal => num.tryParse(value).toDouble()?.toString(),
-    VariableType.boolean =>
-      bool.tryParse(value, caseSensitive: false)?.toString(),
-    VariableType.color =>
-      RegExp(r'^#[0-9a-fA-F]{2,8}$', caseSensitive: false).hasMatch(value)
-          ? value.toUpperCase()
-          : null,
-    // TODO: this could be a bit expensive. Maybe enable only when required!
-    // VariableType.map => tryJsonDecode(value),
-    // VariableType.list => value.toList(),
-    _ => value,
-  };
+  // if (value.isEmpty) return '';
+  switch (type) {
+    case VariableType.text:
+      return value.toString();
+    case VariableType.integer:
+      return num.tryParse(value.toString()).toInt()?.toString();
+    case VariableType.decimal:
+      return num.tryParse(value.toString()).toDouble()?.toString();
+    case VariableType.boolean:
+      return bool.tryParse(value.toString(), caseSensitive: false)?.toString();
+    case VariableType.color:
+      if (value is ColorRGBA) return value.toHex();
+      if (value is ColorRGB) return value.toColorRGBA()!.toHex();
+      final colorMatch = flutterColorRegex.firstMatch(value.toString());
+      if (colorMatch != null) {
+        return ColorRGBA.fromHex(colorMatch.namedGroup('hex')!)?.toHex();
+      }
+      final hexMatch = hexColorRegex.firstMatch(value.toString());
+      if (hexMatch != null) return value.toString().toUpperCase();
+      return null;
+    // This could be a bit expensive. Maybe enable only when required!
+    case VariableType.map:
+      if (value is Map) return jsonEncode(value);
+      final map = value.toMap();
+      return map != null ? jsonEncode(map) : null;
+    case VariableType.list:
+      if (value is List) return jsonEncode(value);
+      final list = value.toList();
+      return list != null ? jsonEncode(list) : null;
+  }
 }
 
 /// Contains all the variables associated with a canvas inside a page.
@@ -242,20 +263,24 @@ class CanvasVariableData extends VariableData {
   @override
   CanvasVariableData copyWith({
     String? name,
-    String? value,
+    Object? value,
     VariableType? type,
     String? id,
     bool? isUsed,
     String? canvasId,
     Set<String>? nodes,
-  }) =>
-      CanvasVariableData(
-        name: name ?? this.name,
-        value: value ?? this.value,
-        type: type ?? this.type,
-        id: id ?? this.id,
-        canvasId: canvasId ?? this.canvasId,
-      );
+  }) {
+    final String? sanitizedValue = value == null
+        ? null
+        : sanitizeValueForVariableType(value, type ?? this.type);
+    return CanvasVariableData(
+      name: name ?? this.name,
+      value: sanitizedValue ?? this.value,
+      type: type ?? this.type,
+      id: id ?? this.id,
+      canvasId: canvasId ?? this.canvasId,
+    );
+  }
 
   @override
   List<Object?> get props => [...super.props, canvasId];

lib/src/api/regexes.dart

@@ -196,3 +196,15 @@ const String rawVariableNamePattern = r'[A-Za-z]+[A-Za-z0-9_]*';
 
 /// Regex for [rawVariableNamePattern].
 final RegExp rawVariableNameRegex = RegExp(rawVariableNamePattern);
+
+/// A regex that matches a string representation of a color from Flutter SDK.
+const String flutterColorPattern = r'^Color\(0x(?<hex>[A-Fa-f0-9]{8})\)$';
+
+/// Regex for [flutterColorPattern].
+final RegExp flutterColorRegex = RegExp(flutterColorPattern);
+
+/// A regex that matches a hex color string.
+const String hexColorPattern = r'^#[A-Fa-f0-9]{2,8}$';
+
+/// Regex for [hexColorPattern].
+final RegExp hexColorRegex = RegExp(hexColorPattern);

lib/src/api/typed_value.dart

@@ -210,58 +210,34 @@ extension ConversionExt on Object? {
       return list.map<int?>((e) => e?.toInt()).toList().tryCast<R>();
     }
     if (R == List<int>) {
-      return list
-          .map<int?>((e) => e?.toInt())
-          .whereNotNull()
-          .toList()
-          .tryCast<R>();
+      return list.map<int?>((e) => e?.toInt()).toList().tryCast<R>();
     }
     if (R == List<double>) {
-      return list
-          .map<double?>((e) => e.toDouble())
-          .whereNotNull()
-          .toList()
-          .tryCast<R>();
+      return list.map<double?>((e) => e.toDouble()).toList().tryCast<R>();
     }
     if (R == List<double?>) {
       return list.map<double?>((e) => e.toDouble()).toList().tryCast<R>();
     }
     if (R == List<num>) {
-      return list
-          .map<num?>((e) => e.toNum())
-          .whereNotNull()
-          .toList()
-          .tryCast<R>();
+      return list.map<num?>((e) => e.toNum()).toList().tryCast<R>();
     }
     if (R == List<num?>) {
       return list.map<num?>((e) => e.toNum()).toList().tryCast<R>();
     }
     if (R == List<bool>) {
-      return list
-          .map<bool?>((e) => e.toBool())
-          .whereNotNull()
-          .toList()
-          .tryCast<R>();
+      return list.map<bool?>((e) => e.toBool()).toList().tryCast<R>();
     }
     if (R == List<bool?>) {
       return list.map<bool?>((e) => e.toBool()).toList().tryCast<R>();
     }
     if (R == List<String>) {
-      return list
-          .map<String?>((e) => e.toString())
-          .whereNotNull()
-          .toList()
-          .tryCast<R>();
+      return list.map<String?>((e) => e.toString()).toList().tryCast<R>();
     }
     if (R == List<String?>) {
       return list.map<String?>((e) => e.toString()).toList().tryCast<R>();
     }
     if (R == List<Map>) {
-      return list
-          .map<Map?>((e) => e.toMap())
-          .whereNotNull()
-          .toList()
-          .tryCast<R>();
+      return list.map<Map?>((e) => e.toMap()).toList().tryCast<R>();
     }
     if (R == List<Map?>) {
       return list.map<Map?>((e) => e.toMap()).toList().tryCast<R>();