Merge pull request #60 from AkiKurisu/dev/v0.6.8

merge dev v0.6.8

Author: AkiKurisu

Runtime/Core/Models/Graph/CeresGraphModule.cs

@@ -7,7 +7,7 @@ namespace Ceres.Graph
 {
     internal class CeresGraphModule: RuntimeModule
     {
-        public override void Initialize(ModuleConfig config)
+        public override void Initialize()
         {
             // Set global log level
             CeresLogger.LogLevel = CeresConfig.Get().logLevel;

Runtime/Core/Models/Graph/Variables/SharedVariableExtension.cs

@@ -1,4 +1,5 @@
 using UnityEngine;
+
 namespace Ceres.Graph
 {
     public static class SharedVariableExtension
@@ -34,7 +35,7 @@ public static SharedVariable GetSharedVariable(this IVariableSource variableScop
         /// <returns></returns>
         public static SharedVariable<T> GetSharedVariable<T>(this IVariableSource variableScope, string variableName)
         {
-            return GetSharedVariable(variableScope, variableName) as SharedVariable<T>;
+            return variableScope.GetSharedVariable(variableName) as SharedVariable<T>;
         }
 
         /// <summary>

Runtime/Core/Models/UObjectLink.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using Newtonsoft.Json.Linq;
 using UObject = UnityEngine.Object;
+
 namespace Ceres
 {
     [Serializable]
@@ -60,7 +61,11 @@ public static void Parse(ref UObjectLink[] uobjectLinks, string serializedData)
             {
                 if (prop.Name != "instanceID") continue;
                 var instanceId = (int)prop.Value;
+#if UNITY_6000_3_OR_NEWER
+                var uObject = UnityEditor.EditorUtility.EntityIdToObject(instanceId);
+#else
                 var uObject = UnityEditor.EditorUtility.InstanceIDToObject(instanceId);
+#endif
                 if (uObject)
                 {
                     Chris.Collections.ArrayUtils.Add(ref uobjectLinks, new UObjectLink(uObject));

Runtime/Flow/Annotations/ExecutableEventAttribute.cs

@@ -6,7 +6,7 @@ namespace Ceres.Graph.Flow.Annotations
     /// Allow this event can be implemented in flow graph
     /// </summary>
     /// <remarks>Annotate event custom create method to let source generator generate wrapper node for creating event</remarks>
-    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, Inherited = false)]
+    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class | AttributeTargets.Struct, Inherited = false)]
     public class ExecutableEventAttribute: Attribute
     {
 

Runtime/SourceGenerators/Ceres.SourceGenerator.deps.json

@@ -8,66 +8,9 @@
     ".NETStandard,Version=v2.0": {},
     ".NETStandard,Version=v2.0/": {
       "Ceres.SourceGenerator/1.0.0": {
-        "dependencies": {
-          "Microsoft.CodeAnalysis.CSharp": "4.1.0",
-          "NETStandard.Library": "2.0.3"
-        },
         "runtime": {
           "Ceres.SourceGenerator.dll": {}
         }
-      },
-      "Microsoft.CodeAnalysis.Analyzers/3.3.3": {},
-      "Microsoft.CodeAnalysis.Common/4.1.0": {
-        "dependencies": {
-          "Microsoft.CodeAnalysis.Analyzers": "3.3.3",
-          "System.Collections.Immutable": "5.0.0",
-          "System.Memory": "4.5.4",
-          "System.Reflection.Metadata": "5.0.0",
-          "System.Runtime.CompilerServices.Unsafe": "5.0.0",
-          "System.Text.Encoding.CodePages": "4.5.1",
-          "System.Threading.Tasks.Extensions": "4.5.4"
-        }
-      },
-      "Microsoft.CodeAnalysis.CSharp/4.1.0": {
-        "dependencies": {
-          "Microsoft.CodeAnalysis.Common": "4.1.0"
-        }
-      },
-      "Microsoft.NETCore.Platforms/1.1.0": {},
-      "NETStandard.Library/2.0.3": {
-        "dependencies": {
-          "Microsoft.NETCore.Platforms": "1.1.0"
-        }
-      },
-      "System.Buffers/4.5.1": {},
-      "System.Collections.Immutable/5.0.0": {
-        "dependencies": {
-          "System.Memory": "4.5.4"
-        }
-      },
-      "System.Memory/4.5.4": {
-        "dependencies": {
-          "System.Buffers": "4.5.1",
-          "System.Numerics.Vectors": "4.4.0",
-          "System.Runtime.CompilerServices.Unsafe": "5.0.0"
-        }
-      },
-      "System.Numerics.Vectors/4.4.0": {},
-      "System.Reflection.Metadata/5.0.0": {
-        "dependencies": {
-          "System.Collections.Immutable": "5.0.0"
-        }
-      },
-      "System.Runtime.CompilerServices.Unsafe/5.0.0": {},
-      "System.Text.Encoding.CodePages/4.5.1": {
-        "dependencies": {
-          "System.Runtime.CompilerServices.Unsafe": "5.0.0"
-        }
-      },
-      "System.Threading.Tasks.Extensions/4.5.4": {
-        "dependencies": {
-          "System.Runtime.CompilerServices.Unsafe": "5.0.0"
-        }
       }
     }
   },
@@ -76,97 +19,6 @@
       "type": "project",
       "serviceable": false,
       "sha512": ""
-    },
-    "Microsoft.CodeAnalysis.Analyzers/3.3.3": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-j/rOZtLMVJjrfLRlAMckJLPW/1rze9MT1yfWqSIbUPGRu1m1P0fuo9PmqapwsmePfGB5PJrudQLvmUOAMF0DqQ==",
-      "path": "microsoft.codeanalysis.analyzers/3.3.3",
-      "hashPath": "microsoft.codeanalysis.analyzers.3.3.3.nupkg.sha512"
-    },
-    "Microsoft.CodeAnalysis.Common/4.1.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-bNzTyxP3iD5FPFHfVDl15Y6/wSoI7e3MeV0lOaj9igbIKTjgrmuw6LoVJ06jUNFA7+KaDC/OIsStWl/FQJz6sQ==",
-      "path": "microsoft.codeanalysis.common/4.1.0",
-      "hashPath": "microsoft.codeanalysis.common.4.1.0.nupkg.sha512"
-    },
-    "Microsoft.CodeAnalysis.CSharp/4.1.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-sbu6kDGzo9bfQxuqWpeEE7I9P30bSuZEnpDz9/qz20OU6pm79Z63+/BsAzO2e/R/Q97kBrpj647wokZnEVr97w==",
-      "path": "microsoft.codeanalysis.csharp/4.1.0",
-      "hashPath": "microsoft.codeanalysis.csharp.4.1.0.nupkg.sha512"
-    },
-    "Microsoft.NETCore.Platforms/1.1.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==",
-      "path": "microsoft.netcore.platforms/1.1.0",
-      "hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512"
-    },
-    "NETStandard.Library/2.0.3": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
-      "path": "netstandard.library/2.0.3",
-      "hashPath": "netstandard.library.2.0.3.nupkg.sha512"
-    },
-    "System.Buffers/4.5.1": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==",
-      "path": "system.buffers/4.5.1",
-      "hashPath": "system.buffers.4.5.1.nupkg.sha512"
-    },
-    "System.Collections.Immutable/5.0.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-FXkLXiK0sVVewcso0imKQoOxjoPAj42R8HtjjbSjVPAzwDfzoyoznWxgA3c38LDbN9SJux1xXoXYAhz98j7r2g==",
-      "path": "system.collections.immutable/5.0.0",
-      "hashPath": "system.collections.immutable.5.0.0.nupkg.sha512"
-    },
-    "System.Memory/4.5.4": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==",
-      "path": "system.memory/4.5.4",
-      "hashPath": "system.memory.4.5.4.nupkg.sha512"
-    },
-    "System.Numerics.Vectors/4.4.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==",
-      "path": "system.numerics.vectors/4.4.0",
-      "hashPath": "system.numerics.vectors.4.4.0.nupkg.sha512"
-    },
-    "System.Reflection.Metadata/5.0.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ==",
-      "path": "system.reflection.metadata/5.0.0",
-      "hashPath": "system.reflection.metadata.5.0.0.nupkg.sha512"
-    },
-    "System.Runtime.CompilerServices.Unsafe/5.0.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==",
-      "path": "system.runtime.compilerservices.unsafe/5.0.0",
-      "hashPath": "system.runtime.compilerservices.unsafe.5.0.0.nupkg.sha512"
-    },
-    "System.Text.Encoding.CodePages/4.5.1": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-4J2JQXbftjPMppIHJ7IC+VXQ9XfEagN92vZZNoG12i+zReYlim5dMoXFC1Zzg7tsnKDM7JPo5bYfFK4Jheq44w==",
-      "path": "system.text.encoding.codepages/4.5.1",
-      "hashPath": "system.text.encoding.codepages.4.5.1.nupkg.sha512"
-    },
-    "System.Threading.Tasks.Extensions/4.5.4": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==",
-      "path": "system.threading.tasks.extensions/4.5.4",
-      "hashPath": "system.threading.tasks.extensions.4.5.4.nupkg.sha512"
     }
   }
 }

Runtime/SourceGenerators/Ceres.SourceGenerator.dll

@@ -0,0 +1,170 @@
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Ceres.SourceGenerator;
+
+[Generator]
+public class BreakStructGenerator : CeresSourceGenerator, ISourceGenerator
+{
+    public void Initialize(GeneratorInitializationContext context)
+    {
+        context.RegisterForSyntaxNotifications(() => new BreakStructSyntaxReceiver());
+    }
+
+    public void Execute(GeneratorExecutionContext context)
+    {
+        if (context.SyntaxReceiver is not BreakStructSyntaxReceiver receiver) return;
+
+        if (!ShouldRunGenerator(context))
+            return;
+
+        Helpers.SetupContext(context);
+        Debug.LogInfo($"[BreakStructGenerator] Execute assembly {context.Compilation.Assembly.Name}");
+
+        // If the attach_debugger key is present (but without value) the returned string is the empty string (not null)
+        var debugAssembly = context.GetOptionsString(GlobalOptions.AttachDebugger);
+        if (debugAssembly != null)
+        {
+            Debug.LaunchDebugger(context, debugAssembly);
+        }
+
+        List<GeneratedFile> generatedFiles = [];
+
+        foreach (var structDeclaration in receiver.Candidates)
+        {
+            var structName = structDeclaration.Identifier.Text;
+            Debug.LogInfo($"[BreakStructGenerator] Analyze {structName}");
+
+            var semanticModel = context.Compilation.GetSemanticModel(structDeclaration.SyntaxTree);
+            var structSymbol = semanticModel.GetDeclaredSymbol(structDeclaration);
+            if (structSymbol == null)
+            {
+                Debug.LogInfo($"[BreakStructGenerator] Can not get declared struct from {structName}");
+                continue;
+            }
+
+            var generateAttribute = structSymbol
+                .GetAttributes()
+                .FirstOrDefault(x =>
+                    x.AttributeClass?.ToDisplayString() == "Ceres.Graph.Flow.Annotations.ExecutableEventAttribute");
+            if (generateAttribute == null)
+            {
+                Debug.LogInfo($"[BreakStructGenerator] Can not find ExecutableEventAttribute from {structName}");
+                continue;
+            }
+
+            if (structDeclaration.Parent is not NamespaceDeclarationSyntax namespaceNode)
+            {
+                Debug.LogInfo($"[BreakStructGenerator] Namespace was not declared in {structName}");
+                continue;
+            }
+            var namespaceName = namespaceNode.Name.ToString();
+
+            // Generate Break node for struct
+            if (receiver.PublicFields.TryGetValue(structDeclaration, out var publicFields))
+            {
+                BreakStructGeneratorTemplate generatorTemplate = new()
+                {
+                    Namespace = namespaceName,
+                    StructName = structName,
+                    PublicFields = publicFields,
+                    Namespaces = receiver.Namespaces[structDeclaration]
+                };
+                var generatedCode = generatorTemplate.GenerateCode();
+                generatedFiles.Add(new GeneratedFile
+                {
+                    ClassName = $"FlowNode_Break_{structName}",
+                    Namespace = namespaceName,
+                    Code = generatedCode,
+                    GeneratedFileName = $"FlowNode_Break_{structName}.gen.cs"
+                });
+            }
+        }
+
+        GenerateFiles(context, generatedFiles);
+    }
+}
+
+public class BreakStructSyntaxReceiver : ISyntaxReceiver
+{
+    public readonly List<StructDeclarationSyntax> Candidates = [];
+
+    public readonly Dictionary<StructDeclarationSyntax, List<GeneratorParameterInfo>> PublicFields = new();
+
+    public readonly Dictionary<StructDeclarationSyntax, HashSet<string>> Namespaces = new();
+
+    public void OnVisitSyntaxNode(SyntaxNode syntaxNode)
+    {
+        if (syntaxNode is not StructDeclarationSyntax structNode)
+            return;
+
+        var hasEventAttribute = structNode
+            .AttributeLists
+            .SelectMany(a => a.Attributes)
+            .Any(attr => attr.Name.ToString().Contains("ExecutableEvent"));
+
+        if (!hasEventAttribute)
+        {
+            return;
+        }
+
+        /* Skip generic types not specify argument */
+        if (structNode.TypeParameterList?.Parameters.Count > 0)
+        {
+            return;
+        }
+
+        Candidates.Add(structNode);
+
+        var namespaces = new HashSet<string>();
+        var root = structNode.SyntaxTree.GetRoot();
+        var usings = root.DescendantNodes().OfType<UsingDirectiveSyntax>();
+        foreach (var usingDirective in usings)
+        {
+            var namespaceName = usingDirective.ToString();
+            namespaces.Add(namespaceName);
+        }
+        Namespaces[structNode] = namespaces;
+
+        var fields = new List<GeneratorParameterInfo>();
+        foreach (var member in structNode.Members)
+        {
+            if (member is FieldDeclarationSyntax fieldDeclaration)
+            {
+                if (!HasPublicField(fieldDeclaration)) continue;
+
+                // Handle multiple variable declarations (e.g., public int x, y;)
+                foreach (var variable in fieldDeclaration.Declaration.Variables)
+                {
+                    var fieldInfo = new GeneratorParameterInfo
+                    {
+                        ParameterType = fieldDeclaration.Declaration.Type!.ToString(),
+                        ParameterName = variable.Identifier.Text
+                    };
+                    fields.Add(fieldInfo);
+                }
+            }
+        }
+        PublicFields[structNode] = fields;
+    }
+
+    private static bool HasPublicField(FieldDeclarationSyntax fieldDeclaration)
+    {
+        // Check if field has public modifier and is not static
+        if (!fieldDeclaration.Modifiers.Any(m => m.IsKind(SyntaxKind.PublicKeyword)))
+        {
+            return false;
+        }
+
+        if (fieldDeclaration.Modifiers.Any(m => m.IsKind(SyntaxKind.StaticKeyword)))
+        {
+            return false;
+        }
+
+        return true;
+    }
+}
+