Id and Entity extension generator

src/Flecs.NET.Codegen/Generators/Alert.cs

@@ -0,0 +1,12 @@
+using Flecs.NET.Codegen.Helpers;
+
+namespace Flecs.NET.Codegen.Generators;
+
+public class Alert : GeneratorBase
+{
+    public override void Generate()
+    {
+        AddSource($"Alert.Id.g.cs", Id.GenerateExtensions(Type.Alert));
+        AddSource($"Alert.Entity.g.cs", Entity.GenerateExtensions(Type.Alert));
+    }
+}

src/Flecs.NET.Codegen/Generators/Component.cs

@@ -0,0 +1,12 @@
+using Flecs.NET.Codegen.Helpers;
+
+namespace Flecs.NET.Codegen.Generators;
+
+public class Component : GeneratorBase
+{
+    public override void Generate()
+    {
+        AddSource($"Component.Id.g.cs", Id.GenerateExtensions(Type.Component));
+        AddSource($"Component.Entity.g.cs", Entity.GenerateExtensions(Type.Component));
+    }
+}

src/Flecs.NET.Codegen/Generators/Id.cs

@@ -0,0 +1,124 @@
+using Flecs.NET.Codegen.Helpers;
+
+namespace Flecs.NET.Codegen.Generators;
+
+public static class Id
+{
+    public static string GenerateExtensions(Type type, int i = -1)
+    {
+        return $$"""
+            namespace Flecs.NET.Core;
+
+            public unsafe partial struct {{Generator.GetTypeName(type, i)}}
+            {
+                /// <inheritdoc cref="Id.IsPair()"/>
+                public bool IsPair()
+                {
+                    return Id.IsPair();
+                }
+
+                /// <inheritdoc cref="Id.IsWildCard()"/>
+                public bool IsWildCard()
+                {
+                    return Id.IsWildCard();
+                }
+
+                /// <inheritdoc cref="Id.IsEntity()"/>
+                public bool IsEntity()
+                {
+                    return Id.IsEntity();
+                }
+
+                /// <inheritdoc cref="Id.ToEntity()"/>
+                public Entity ToEntity()
+                {
+                    return Id.ToEntity();
+                }
+
+                /// <inheritdoc cref="Id.AddFlags(ulong)"/>
+                public Entity AddFlags(ulong flags)
+                {
+                    return Id.AddFlags(flags);
+                }
+
+                /// <inheritdoc cref="Id.RemoveFlags(ulong)"/>
+                public Entity RemoveFlags(ulong flags)
+                {
+                    return Id.RemoveFlags(flags);
+                }
+
+                /// <inheritdoc cref="Id.RemoveFlags()"/>
+                public Entity RemoveFlags()
+                {
+                    return Id.RemoveFlags();
+                }
+
+                /// <inheritdoc cref="Id.RemoveGeneration()"/>
+                public Entity RemoveGeneration()
+                {
+                    return Id.RemoveGeneration();
+                }
+
+                /// <inheritdoc cref="Id.TypeId()"/>
+                public Entity TypeId()
+                {
+                    return Id.TypeId();
+                }
+
+                /// <inheritdoc cref="Id.HasFlags(ulong)"/>
+                public bool HasFlags(ulong flags)
+                {
+                    return Id.HasFlags(flags);
+                }
+
+                /// <inheritdoc cref="Id.HasFlags()"/>
+                public bool HasFlags()
+                {
+                    return Id.HasFlags();
+                }
+
+                /// <inheritdoc cref="Id.Flags()"/>
+                public Entity Flags()
+                {
+                    return Id.Flags();
+                }
+
+                /// <inheritdoc cref="Id.HasRelation(ulong)"/>
+                public bool HasRelation(ulong first)
+                {
+                    return Id.HasRelation(first);
+                }
+
+                /// <inheritdoc cref="Id.First()"/>
+                public Entity First()
+                {
+                    return Id.First();
+                }
+
+                /// <inheritdoc cref="Id.Second()"/>
+                public Entity Second()
+                {
+                    return Id.Second();
+                }
+
+                /// <inheritdoc cref="Id.Str()"/>
+                public string Str()
+                {
+                    return Id.Str();
+                }
+
+                /// <inheritdoc cref="Id.FlagsStr()"/>
+                public string FlagsStr()
+                {
+                    return Id.FlagsStr();
+                }
+
+                /// <inheritdoc cref="Id.CsWorld()"/>
+                public World CsWorld()
+                {
+                    return Id.CsWorld();
+                }
+            }
+            """;
+    }
+}

src/Flecs.NET.Codegen/Generators/Observer.cs

@@ -6,9 +6,14 @@ public class Observer : GeneratorBase
 {
     public override void Generate()
     {
+        AddSource($"Observer.Id.g.cs", Id.GenerateExtensions(Type.Observer));
+        AddSource($"Observer.Entity.g.cs", Entity.GenerateExtensions(Type.Observer));
+
         for (int i = 0; i < Generator.GenericCount; i++)
         {
             AddSource($"Observer/T{i + 1}.g.cs", GenerateObserver(i));
+            AddSource($"Observer.Id/T{i + 1}.g.cs", Id.GenerateExtensions(Type.Observer, i));
+            AddSource($"Observer.Entity/T{i + 1}.g.cs", Entity.GenerateExtensions(Type.Observer, i));
         }
     }
 
@@ -26,7 +31,7 @@ namespace Flecs.NET.Core;
             ///     A type-safe wrapper around <see cref="Observer"/> that takes 16 type arguments.
             /// </summary>
             /// {{Generator.XmlTypeParameters[i]}}
-            public unsafe struct {{Generator.GetTypeName(Type.Observer, i)}} : IEquatable<{{Generator.GetTypeName(Type.Observer, i)}}>, IDisposable
+            public unsafe partial struct {{Generator.GetTypeName(Type.Observer, i)}} : IEquatable<{{Generator.GetTypeName(Type.Observer, i)}}>, IDisposable
             {
                 private Observer _observer;
 
@@ -69,12 +74,6 @@ public void Dispose()
                     _observer.Dispose();
                 }
 
-                /// <inheritdoc cref="Observer.Destruct"/>
-                public void Destruct()
-                {
-                    _observer.Destruct();
-                }
-
                 ///
                 public void Ctx(void* ctx)
                 {
@@ -111,7 +110,7 @@ public static implicit operator Id({{Generator.GetTypeName(Type.Observer, i)}} o
                     return ToId(observer);
                 }
 
-                /// <inheritdoc cref="Observer.ToEntity"/>
+                /// <inheritdoc cref="Observer.ToEntity(Observer)"/>
                 public static implicit operator Entity({{Generator.GetTypeName(Type.Observer, i)}} observer)
                 {
                     return ToEntity(observer);
@@ -129,7 +128,7 @@ public static Id ToId({{Generator.GetTypeName(Type.Observer, i)}} observer)
                     return observer.Id;
                 }
 
-                /// <inheritdoc cref="Observer.ToEntity"/>
+                /// <inheritdoc cref="Observer.ToEntity(Observer)"/>
                 public static Entity ToEntity({{Generator.GetTypeName(Type.Observer, i)}} observer)
                 {
                     return observer.Entity;

src/Flecs.NET.Codegen/Generators/Pipeline.cs

@@ -6,14 +6,21 @@ public class Pipeline : GeneratorBase
 {
     public override void Generate()
     {
+        AddSource($"Pipeline.Id.g.cs", Id.GenerateExtensions(Type.Pipeline));
+        AddSource($"Pipeline.Entity.g.cs", Entity.GenerateExtensions(Type.Pipeline));
+
         for (int i = 0; i < Generator.GenericCount; i++)
         {
             AddSource($"Pipeline/T{i + 1}.g.cs", GeneratePipeline(i));
+            AddSource($"Pipeline.Id/T{i + 1}.g.cs", Id.GenerateExtensions(Type.Pipeline, i));
+            AddSource($"Pipeline.Entity/T{i + 1}.g.cs", Entity.GenerateExtensions(Type.Pipeline, i));
         }
     }
 
     private static string GeneratePipeline(int i)
     {
+        string typeName = Generator.GetTypeName(Type.Pipeline, i);
+
         return $$"""
             #nullable enable
 
@@ -26,7 +33,7 @@ namespace Flecs.NET.Core;
             ///     A type-safe wrapper around <see cref="Pipeline"/> that takes {{i + 1}} type arguments.
             /// </summary>
             /// {{Generator.XmlTypeParameters[i]}}
-            public unsafe partial struct {{Generator.GetTypeName(Type.Pipeline, i)}} : IEquatable<{{Generator.GetTypeName(Type.Pipeline, i)}}>, IEntity
+            public unsafe partial struct {{typeName}} : IEquatable<{{typeName}}>, IEntity<{{typeName}}>
             {
                 private Pipeline _pipeline;
 
@@ -61,37 +68,37 @@ public Pipeline(Entity entity)
                 }
 
                 /// <inheritdoc cref="Pipeline.ToUInt64(Pipeline)"/>
-                public static implicit operator ulong({{Generator.GetTypeName(Type.Pipeline, i)}} pipeline)
+                public static implicit operator ulong({{typeName}} pipeline)
                 {
                     return ToUInt64(pipeline);
                 }
 
                 /// <inheritdoc cref="Pipeline.ToId(Pipeline)"/>
-                public static implicit operator Id({{Generator.GetTypeName(Type.Pipeline, i)}} pipeline)
+                public static implicit operator Id({{typeName}} pipeline)
                 {
                     return ToId(pipeline);
                 }
 
                 /// <inheritdoc cref="Pipeline.ToEntity(Pipeline)"/>
-                public static implicit operator Entity({{Generator.GetTypeName(Type.Pipeline, i)}} pipeline)
+                public static implicit operator Entity({{typeName}} pipeline)
                 {
                     return ToEntity(pipeline);
                 }
 
                 /// <inheritdoc cref="Pipeline.ToUInt64(Pipeline)"/>
-                public static ulong ToUInt64({{Generator.GetTypeName(Type.Pipeline, i)}} pipeline)
+                public static ulong ToUInt64({{typeName}} pipeline)
                 {
                     return pipeline.Entity;
                 }
 
                 /// <inheritdoc cref="Pipeline.ToId(Pipeline)"/>
-                public static Id ToId({{Generator.GetTypeName(Type.Pipeline, i)}} pipeline)
+                public static Id ToId({{typeName}} pipeline)
                 {
                     return pipeline.Id;
                 }
 
                 /// <inheritdoc cref="Pipeline.ToEntity(Pipeline)"/>
-                public static Entity ToEntity({{Generator.GetTypeName(Type.Pipeline, i)}} pipeline)
+                public static Entity ToEntity({{typeName}} pipeline)
                 {
                     return pipeline.Entity;
                 }
@@ -103,15 +110,15 @@ public override string ToString()
                 }
 
                 /// <inheritdoc cref="Pipeline.Equals(Pipeline)"/>
-                public bool Equals({{Generator.GetTypeName(Type.Pipeline, i)}} other)
+                public bool Equals({{typeName}} other)
                 {
                     return Entity == other.Entity;
                 }
 
                 /// <inheritdoc cref="Pipeline.Equals(object)"/>
                 public override bool Equals(object? obj)
                 {
-                    return obj is {{Generator.GetTypeName(Type.Pipeline, i)}} other && Equals(other);
+                    return obj is {{typeName}} other && Equals(other);
                 }
 
                 /// <inheritdoc cref="Pipeline.GetHashCode()"/>
@@ -121,13 +128,13 @@ public override int GetHashCode()
                 }
 
                 /// <inheritdoc cref="Pipeline.op_Equality"/>
-                public static bool operator ==({{Generator.GetTypeName(Type.Pipeline, i)}} left, {{Generator.GetTypeName(Type.Pipeline, i)}} right)
+                public static bool operator ==({{typeName}} left, {{typeName}} right)
                 {
                     return left.Equals(right);
                 }
 
                 /// <inheritdoc cref="Pipeline.op_Inequality"/>
-                public static bool operator !=({{Generator.GetTypeName(Type.Pipeline, i)}} left, {{Generator.GetTypeName(Type.Pipeline, i)}} right)
+                public static bool operator !=({{typeName}} left, {{typeName}} right)
                 {
                     return !(left == right);
                 }

src/Flecs.NET.Codegen/Generators/System_.cs

@@ -9,9 +9,14 @@ public class System_ : GeneratorBase
 {
     public override void Generate()
     {
+        AddSource($"System.Id.g.cs", Id.GenerateExtensions(Type.System_));
+        AddSource($"System.Entity.g.cs", Entity.GenerateExtensions(Type.System_));
+
         for (int i = 0; i < Generator.GenericCount; i++)
         {
             AddSource($"System/T{i + 1}.g.cs", GenerateSystem(i));
+            AddSource($"System.Id/T{i + 1}.g.cs", Id.GenerateExtensions(Type.System, i));
+            AddSource($"System.Entity/T{i + 1}.g.cs", Entity.GenerateExtensions(Type.System, i));
         }
     }
 
@@ -31,7 +36,7 @@ namespace Flecs.NET.Core;
             ///     A type-safe wrapper around <see cref="System"/> that takes {{i + 1}} type arguments.
             /// </summary>
             /// {{Generator.XmlTypeParameters[i]}}
-            public unsafe struct {{systemTypeName}} : IEquatable<{{systemTypeName}}>, IEntity
+            public unsafe partial struct {{systemTypeName}} : IEquatable<{{systemTypeName}}>, IEntity<{{systemTypeName}}>
             {
                 private System_ _system;
 
@@ -68,12 +73,6 @@ public System(Entity entity)
                     _system = new System_(entity);
                 }
 
-                /// <inheritdoc cref="System_.Destruct()"/>
-                public void Destruct()
-                {
-                    _system.Destruct();
-                }
-
                 ///
                 public void Ctx(void* ctx)
                 {
@@ -188,7 +187,7 @@ public static implicit operator Id({{systemTypeName}} system)
                     return ToId(system);
                 }
 
-                /// <inheritdoc cref="System_.ToEntity"/>
+                /// <inheritdoc cref="System_.ToEntity(System_)"/>
                 public static implicit operator Entity({{systemTypeName}} system)
                 {
                     return ToEntity(system);
@@ -206,7 +205,7 @@ public static Id ToId({{systemTypeName}} system)
                     return system.Id;
                 }
 
-                /// <inheritdoc cref="System_.ToEntity"/>
+                /// <inheritdoc cref="System_.ToEntity(System_)"/>
                 public static Entity ToEntity({{systemTypeName}} system)
                 {
                     return system.Entity;

src/Flecs.NET.Codegen/Generators/TimerEntity.cs

@@ -0,0 +1,12 @@
+using Flecs.NET.Codegen.Helpers;
+
+namespace Flecs.NET.Codegen.Generators;
+
+public class TimerEntity : GeneratorBase
+{
+    public override void Generate()
+    {
+        AddSource($"TimerEntity.Id.g.cs", Id.GenerateExtensions(Type.TimerEntity));
+        AddSource($"TimerEntity.Entity.g.cs", Entity.GenerateExtensions(Type.TimerEntity));
+    }
+}

src/Flecs.NET.Codegen/Generators/UntypedComponent.cs

@@ -0,0 +1,12 @@
+using Flecs.NET.Codegen.Helpers;
+
+namespace Flecs.NET.Codegen.Generators;
+
+public class UntypedComponent : GeneratorBase
+{
+    public override void Generate()
+    {
+        AddSource($"UntypedComponent.Id.g.cs", Id.GenerateExtensions(Type.UntypedComponent));
+        AddSource($"UntypedComponent.Entity.g.cs", Entity.GenerateExtensions(Type.UntypedComponent));
+    }
+}