support uuids

common/lib/realm_common.dart

@@ -19,4 +19,5 @@
 export 'src/realm_common_base.dart';
 export 'src/realm_types.dart';
 
-export 'package:objectid/objectid.dart' show ObjectId;
+export 'package:objectid/objectid.dart' show ObjectId;
+export 'package:uuid/uuid.dart' show UuidValue;

common/lib/src/realm_types.dart

@@ -19,6 +19,7 @@
 import 'dart:ffi';
 import 'dart:typed_data';
 import 'package:objectid/objectid.dart';
+import 'package:uuid/uuid.dart';
 
 /// All supported `Realm` property types.
 /// {@category Configuration}
@@ -78,9 +79,6 @@ class RealmStateError extends StateError implements RealmError {
   RealmStateError(String message) : super(message);
 }
 
-/// @nodoc
-class Uuid {} // TODO!
-
 /// @nodoc
 class Decimal128 {} // TODO!
 
@@ -108,5 +106,5 @@ class RealmAny {
   const RealmAny.dateTime(DateTime timestamp) : this._(timestamp);
   const RealmAny.objectId(ObjectId id) : this._(id);
   const RealmAny.decimal128(Decimal128 decimal) : this._(decimal);
-  const RealmAny.uuid(Uuid uuid) : this._(uuid);
+  const RealmAny.uuid(UuidValue uuid) : this._(uuid);
 }

common/pubspec.yaml

@@ -14,6 +14,7 @@ environment:
 
 dependencies: 
   objectid: ^2.1.0
+  uuid: ^3.0.6
 
 dev_dependencies:
   lints: ^1.0.1

generator/lib/src/dart_type_ex.dart

@@ -107,7 +107,7 @@ extension DartTypeEx on DartType {
     if (isRealmModel) return RealmPropertyType.object;
     if (isRealmBacklink) return RealmPropertyType.linkingObjects;
     if (isExactly<ObjectId>()) return RealmPropertyType.objectid;
-    if (isExactly<Uuid>()) return RealmPropertyType.uuid;
+    if (isExactly<UuidValue>()) return RealmPropertyType.uuid;
 
     return null;
   }

generator/lib/src/field_element_ex.dart

@@ -82,8 +82,7 @@ extension FieldElementEx on FieldElement {
       if (type.isDartCoreSet || //
           type.isDartCoreMap ||
           type.isRealmAny ||
-          type.isExactly<Decimal128>() ||
-          type.isExactly<Uuid>()) {
+          type.isExactly<Decimal128>()) {
         throw RealmInvalidGenerationSourceError(
           'Field type not supported yet',
           element: this,
@@ -145,7 +144,8 @@ extension FieldElementEx on FieldElement {
 
       // Validate indexes
       if ((primaryKey != null || indexed != null) &&
-          (![RealmPropertyType.string, RealmPropertyType.int, RealmPropertyType.objectid].contains(type.realmType) || type.isRealmCollection)) {
+          (![RealmPropertyType.string, RealmPropertyType.int, RealmPropertyType.objectid, RealmPropertyType.uuid].contains(type.realmType) ||
+              type.isRealmCollection)) {
         final file = span!.file;
         final annotation = (primaryKey ?? indexed)!.annotation;
 

generator/test/good_test_data/primary_key.dart

@@ -15,4 +15,10 @@ class _StringPK {
 class _ObjectIdPK {
   @PrimaryKey()
   late ObjectId id;
+}
+
+@RealmModel()
+class _UuidPK {
+  @PrimaryKey()
+  late UuidValue id;
 }

generator/test/good_test_data/primary_key.expected

@@ -84,4 +84,32 @@ class ObjectIdPK extends _ObjectIdPK with RealmEntity, RealmObject {
       SchemaProperty('id', RealmPropertyType.objectid, primaryKey: true),
     ]);
   }
+}
+
+class UuidPK extends _UuidPK with RealmEntity, RealmObject {
+  UuidPK(
+    UuidValue id,
+  ) {
+    RealmObject.set(this, 'id', id);
+  }
+
+  UuidPK._();
+
+  @override
+  UuidValue get id => RealmObject.get<UuidValue>(this, 'id') as UuidValue;
+  @override
+  set id(UuidValue value) => throw RealmUnsupportedSetError();
+
+  @override
+  Stream<RealmObjectChanges<UuidPK>> get changes =>
+      RealmObject.getChanges<UuidPK>(this);
+
+  static SchemaObject get schema => _schema ??= _initSchema();
+  static SchemaObject? _schema;
+  static SchemaObject _initSchema() {
+    RealmObject.registerFactory(UuidPK._);
+    return const SchemaObject(UuidPK, [
+      SchemaProperty('id', RealmPropertyType.uuid, primaryKey: true),
+    ]);
+  }
 }

lib/src/native/realm_core.dart

@@ -26,7 +26,6 @@ import 'dart:typed_data';
 // Hide StringUtf8Pointer.toNativeUtf8 and StringUtf16Pointer since these allows silently allocating memory. Use toUtf8Ptr instead
 import 'package:ffi/ffi.dart' hide StringUtf8Pointer, StringUtf16Pointer;
 
-import '../application.dart';
 import '../collections.dart';
 import '../init.dart';
 import '../list.dart';
@@ -1020,9 +1019,15 @@ void _intoRealmValue(Object? value, Pointer<realm_value_t> realm_value, Allocato
         for (var i = 0; i < 12; i++) {
           realm_value.ref.values.object_id.bytes[i] = bytes[i];
         }
-
         realm_value.ref.type = realm_value_type.RLM_TYPE_OBJECT_ID;
         break;
+      case UuidValue:
+        final bytes = (value as UuidValue).toBytes();
+        for (var i = 0; i < 16; i++) {
+          realm_value.ref.values.uuid.bytes[i] = bytes[i];
+        }
+        realm_value.ref.type = realm_value_type.RLM_TYPE_UUID;
+        break;
       default:
         throw RealmException("Property type ${value.runtimeType} not supported");
     }
@@ -1062,7 +1067,7 @@ extension on Pointer<realm_value_t> {
       case realm_value_type.RLM_TYPE_OBJECT_ID:
         return ObjectId.fromBytes(cast<Uint8>().asTypedList(12));
       case realm_value_type.RLM_TYPE_UUID:
-        throw Exception("Not implemented");
+        return UuidValue.fromList(cast<Uint8>().asTypedList(16));
       default:
         throw RealmException("realm_value_type ${ref.type} not supported");
     }

lib/src/realm_class.dart

@@ -32,7 +32,19 @@ import 'results.dart';
 // always expose with `show` to explicitly control the public API surface
 export 'application.dart' show ApplicationConfiguration, MetadataPersistenceMode;
 export 'package:realm_common/realm_common.dart'
-    show Ignored, Indexed, MapTo, PrimaryKey, RealmError, RealmModel, RealmUnsupportedSetError, RealmStateError, RealmCollectionType, RealmPropertyType, ObjectId;
+    show
+        Ignored,
+        Indexed,
+        MapTo,
+        PrimaryKey,
+        RealmError,
+        RealmModel,
+        RealmUnsupportedSetError,
+        RealmStateError,
+        RealmCollectionType,
+        RealmPropertyType,
+        ObjectId,
+        UuidValue;
 export "configuration.dart" show Configuration, RealmSchema, SchemaObject;
 export 'list.dart' show RealmList, RealmListOfObject, RealmListChanges;
 export 'realm_object.dart' show RealmEntity, RealmException, RealmObject, RealmObjectChanges;

test/realm_object_test.dart

@@ -47,6 +47,12 @@ class _StringPrimaryKey {
   late String id;
 }
 
+@RealmModel()
+class _UuidPrimaryKey {
+  @PrimaryKey()
+  late UuidValue id;
+}
+
 Future<void> main([List<String>? args]) async {
   print("Current PID $pid");
 
@@ -300,4 +306,12 @@ Future<void> main([List<String>? args]) async {
   for (final pk in objectIds) {
     testPrimaryKey(ObjectIdPrimaryKey.schema, () => ObjectIdPrimaryKey(pk), pk);
   }
+
+  final uuids = [
+    UuidValue('0f1dea4d-074e-4c72-b505-e2e8a727602f'),
+    UuidValue('00000000-0000-0000-0000-000000000000'),
+  ];
+  for (final pk in uuids) {
+    testPrimaryKey(UuidPrimaryKey.schema, () => UuidPrimaryKey(pk), pk);
+  }
 }