Added BsonRefId<T> to allow explicit DbRefs in LINQ expressions

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+[Discord](https://discord.gg/u8seFBH9Zu).
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

LiteDB.Tests/Mapper/LinqBsonExpression_Tests.cs

@@ -83,6 +83,14 @@ public class Order
 
             [BsonRef("users")]
             public List<User> Users { get; set; }
+
+            [BsonRef("products")]
+            public Product[] Products { get; set; }
+        }
+
+        public class OrderCustomer : Customer
+        {
+            // Just used to test derived types serialization in BsonRefId tests
         }
 
         public class Account
@@ -524,6 +532,56 @@ public void Linq_InvocationExpression()
             //the right expr of exprMerged uses @ (instead of $) because the rootParameter is different for exprLeft and exprRight
         }
 
+        [Fact]
+        public void Linq_MemberInit_DbRef()
+        {
+            var p1Id = ObjectId.NewObjectId();
+            var p2Id = ObjectId.NewObjectId();
+
+            TestExpr<Order>(
+                x => new Order
+                {
+                    OrderNumber = 1,
+                    Customer = new BsonRefId<OrderCustomer>(10),
+                    Users = new List<User>
+                    {
+                        new BsonRefId<User>(101),
+                        new BsonRefId<User>(x.Users[0].Id + 100),
+                    },
+                    Products = new Product[]
+                    {
+                        new BsonRefId<Product>(p1Id),
+                        new BsonRefId<Product>(p2Id),
+                    },
+                },
+                @"{
+                    _id: @p0,
+                    Customer: { $id: @p1, $ref: @p2, $type: @p3 },
+                    Users:[
+                        { $id: @p4, $ref: @p5 },
+                        { $id: ($.Users[0].$id + @p6), $ref: @p7 }
+                    ],
+                    Products: [
+                        { $id: @p8, $ref: @p9 },
+                        { $id: @p10, $ref: @p11 }
+                    ]
+                }",
+                [
+                    1,
+                    10,
+                    "customers",
+                    DefaultTypeNameBinder.Instance.GetName(typeof(OrderCustomer)),
+                    101,
+                    "users",
+                    100,
+                    "users",
+                    p1Id,
+                    "products",
+                    p2Id,
+                    "products",
+                ]);
+        }
+
         #region Test helper
 
         /// <summary>
@@ -582,4 +640,4 @@ private void TestException<T, TException>(Func<Expression<Func<T, object>>> fn)
 
         #endregion
     }
-}
+}

LiteDB/Client/Mapper/BsonMapper.Serialize.cs

@@ -188,7 +188,7 @@ private BsonDocument SerializeObject(Type type, object obj, int depth)
             // adding _type only where property Type is not same as object instance type
             if (type != t)
             {
-                doc["_type"] = new BsonValue(_typeNameBinder.GetName(t));
+                doc["_type"] = SerializeTypeName(t);
             }
 
             foreach (var member in entity.Members.Where(x => x.Getter != null))
@@ -211,5 +211,13 @@ private BsonDocument SerializeObject(Type type, object obj, int depth)
 
             return doc;
         }
+
+        /// <summary>
+        /// Returns the name of the given type for serialization (type discriminator).
+        /// </summary>
+        internal BsonValue SerializeTypeName(Type type)
+        {
+            return new BsonValue(_typeNameBinder.GetName(type));
+        }
     }
-}
+}

LiteDB/Client/Mapper/BsonMapper.cs

@@ -227,22 +227,22 @@ public BsonMapper UseLowerCaseDelimiter(char delimiter = '_')
         /// </summary>
         internal static void RegisterDbRef(BsonMapper mapper, MemberMapper member, ITypeNameBinder typeNameBinder, string collection)
         {
-            member.IsDbRef = true;
+            member.DbRefCollectionName = collection;
 
             if (member.IsEnumerable)
             {
-                RegisterDbRefList(mapper, member, typeNameBinder, collection);
+                RegisterDbRefList(mapper, member, typeNameBinder);
             }
             else
             {
-                RegisterDbRefItem(mapper, member, typeNameBinder, collection);
+                RegisterDbRefItem(mapper, member, typeNameBinder);
             }
         }
 
         /// <summary>
         /// Register a property as a DbRef - implement a custom Serialize/Deserialize actions to convert entity to $id, $ref only
         /// </summary>
-        private static void RegisterDbRefItem(BsonMapper mapper, MemberMapper member, ITypeNameBinder typeNameBinder, string collection)
+        private static void RegisterDbRefItem(BsonMapper mapper, MemberMapper member, ITypeNameBinder typeNameBinder)
         {
             // get entity
             var entity = mapper.GetEntityMapper(member.DataType);
@@ -263,12 +263,12 @@ private static void RegisterDbRefItem(BsonMapper mapper, MemberMapper member, IT
                 var bsonDocument = new BsonDocument
                 {
                     ["$id"] = m.Serialize(id.GetType(), id, 0),
-                    ["$ref"] = collection
+                    ["$ref"] = member.DbRefCollectionName
                 };
 
                 if (member.DataType != obj.GetType())
                 {
-                    bsonDocument["$type"] = typeNameBinder.GetName(obj.GetType());
+                    bsonDocument["$type"] = mapper.SerializeTypeName(obj.GetType());
                 }
 
                 return bsonDocument;
@@ -311,7 +311,7 @@ private static void RegisterDbRefItem(BsonMapper mapper, MemberMapper member, IT
         /// <summary>
         /// Register a property as a DbRefList - implement a custom Serialize/Deserialize actions to convert entity to $id, $ref only
         /// </summary>
-        private static void RegisterDbRefList(BsonMapper mapper, MemberMapper member, ITypeNameBinder typeNameBinder, string collection)
+        private static void RegisterDbRefList(BsonMapper mapper, MemberMapper member, ITypeNameBinder typeNameBinder)
         {
             // get entity from list item type
             var entity = mapper.GetEntityMapper(member.UnderlyingType);
@@ -334,12 +334,12 @@ private static void RegisterDbRefList(BsonMapper mapper, MemberMapper member, IT
                     var bsonDocument = new BsonDocument
                     {
                         ["$id"] = m.Serialize(id.GetType(), id, 0),
-                        ["$ref"] = collection
+                        ["$ref"] = member.DbRefCollectionName
                     };
 
                     if (member.UnderlyingType != item.GetType())
                     {
-                        bsonDocument["$type"] = typeNameBinder.GetName(item.GetType());
+                        bsonDocument["$type"] = mapper.SerializeTypeName(item.GetType());
                     }
 
                     result.Add(bsonDocument);
@@ -402,4 +402,4 @@ private static void RegisterDbRefList(BsonMapper mapper, MemberMapper member, IT
 
         #endregion
     }
-}
+}

LiteDB/Client/Mapper/BsonRefId.cs

@@ -0,0 +1,33 @@
+using System;
+
+namespace LiteDB;
+
+/// <summary>
+/// Helper to assign the ID of a DbRef property (see <see cref="BsonRefAttribute"/>) in expression trees.
+/// </summary>
+/// <typeparam name="T">The type of the referenced entity.</typeparam>
+/// <example><code>
+/// db.GetCollection&lt;A&gt;()
+///   .UpdateMany(
+///     x => new A
+///     {
+///       Id = x.Id,
+///       Bref = new BsonRefId&lt;B&gt;(100),
+///     },
+///     x => x.Id == 11);
+/// </code></example>
+public sealed class BsonRefId<T>
+{
+    /// <summary>
+    /// Assigns the ID of the referenced entity of type <typeparamref name="T"/>.
+    /// </summary>
+    /// <param name="id">The ID to assign.</param>
+    public BsonRefId(BsonValue id)
+    {
+    }
+
+    public static implicit operator T(BsonRefId<T> _)
+    {
+        throw new NotSupportedException("The type BsonRefId<T> can only be used in LiteDB LINQ expressions.");
+    }
+}