[NEW-FEATURE] [IXD] Prefix Uids with 'plc' in order to avoid duplicity with the twin objects

src/ix.compiler/src/ixd/Helpers/YamlHelpers.cs

@@ -32,7 +32,7 @@ public string[] GetInheritedMembers(IClassDeclaration classDeclaration)
                .Select(p => ((IClassDeclaration)p).Fields.Where(f => CanBeFieldInherited(f, classDeclaration, p))).ToList()
                .ForEach(member => extendedFields = extendedFields.Concat(member));
 
-            return extendedFields.Select(f => f.FullyQualifiedName)
+            return extendedFields.Select(f => GetBaseUid(f))
                                  .Concat(extendedMethods.Select(m => GetMethodUId(m))).ToArray();
         }
         // check if field can be inherited
@@ -174,35 +174,43 @@ private string GetTextFromXml(XmlNode element, PropertyInfo? prop)
             return(inputParams, fullDeclaration.ToString());
         }
 
-        //get uid of method
-        public string GetMethodUId(IMethodDeclaration methodDeclaration)
-        {
-            StringBuilder typeDeclaration = new StringBuilder();
-            var inputParamsDeclaration = methodDeclaration.Variables.Where(v => v.Section == Section.Input).ToList();
-            foreach (var p in inputParamsDeclaration)
+        private string GetMethodTypeDeclaration(IList<IVariableDeclaration> inputParams)
+        { 
+          StringBuilder typeDeclaration = new StringBuilder();
+
+            foreach (var p in inputParams)
             {
                 typeDeclaration.Append(p.Type);
-                if(inputParamsDeclaration.Last() != p) 
+                if(inputParams.Last() != p) 
                 { 
                     typeDeclaration.Append(",");
                 }
-            }
-            return $"{methodDeclaration.FullyQualifiedName}({typeDeclaration.ToString()})";
+            }    
+            return typeDeclaration.ToString();
+        }
+
+        //get uid of method
+        public string GetMethodUId(IMethodDeclaration methodDeclaration)
+        {
+            var inputParamsDeclaration = methodDeclaration.Variables.Where(v => v.Section == Section.Input).ToList();
+            var declaration=GetMethodTypeDeclaration(inputParamsDeclaration);
+            return $"plc.{methodDeclaration.FullyQualifiedName}({declaration})";
+        }
+        // get base uid of field
+        public string GetBaseUid(IDeclaration declaration) => $"plc.{declaration.FullyQualifiedName}";
+        //get id of method
+        public string GetMethodId(IMethodDeclaration methodDeclaration)
+        {
+            var inputParamsDeclaration = methodDeclaration.Variables.Where(v => v.Section == Section.Input).ToList();
+            var declaration=GetMethodTypeDeclaration(inputParamsDeclaration);
+            return $"plc.{methodDeclaration.Name}({declaration})";
         }
 
         public string GetMethodUId(IMethodPrototypeDeclaration methodDeclaration)
         {
-            StringBuilder typeDeclaration = new StringBuilder();
             var inputParamsDeclaration = methodDeclaration.Variables.Where(v => v.Section == Section.Input).ToList();
-            foreach (var p in inputParamsDeclaration)
-            {
-                typeDeclaration.Append(p.Type);
-                if (inputParamsDeclaration.Last() != p)
-                {
-                    typeDeclaration.Append(",");
-                }
-            }
-            return $"{methodDeclaration.FullyQualifiedName}({typeDeclaration.ToString()})";
+            var declaration=GetMethodTypeDeclaration(inputParamsDeclaration);
+            return $"plc.{methodDeclaration.FullyQualifiedName}({declaration.ToString()})";
         }
 
 
@@ -276,11 +284,11 @@ public void AddInheritedMembersReferences(Item item, MyNodeVisitor v)
         //add references for namespace
         public void AddNamespaceReference(IDeclaration declaration, MyNodeVisitor v)
         {
-            if (v.YamlHelper.NamespaceReferences.Where(a => a.Uid == declaration.FullyQualifiedName).Count() > 0)
+            if (v.YamlHelper.NamespaceReferences.Where(a => a.Uid == GetBaseUid(declaration)).Count() > 0)
                 return;
             var reference = new Reference
             {
-                Uid = declaration.FullyQualifiedName,
+                Uid = GetBaseUid(declaration),
                 Name = declaration.Name,
                 FullName = declaration.FullyQualifiedName,
                 NameWithType = declaration.Name
@@ -290,11 +298,11 @@ public void AddNamespaceReference(IDeclaration declaration, MyNodeVisitor v)
         //add general reference
         public void AddReference(IDeclaration declaration, MyNodeVisitor v)
         {
-            if (v.YamlHelper.References.Where(a => a.Uid == declaration.FullyQualifiedName).Count() > 0)
+            if (v.YamlHelper.References.Where(a => a.Uid == GetBaseUid(declaration)).Count() > 0)
                 return;
             var reference = new Reference
             {
-                Uid = declaration.FullyQualifiedName,
+                Uid = GetBaseUid(declaration),
                 Name = declaration.Name,
                 FullName = declaration.FullyQualifiedName,
                 NameWithType = declaration.Name

src/ix.compiler/src/ixd/Ix.ixd.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

src/ix.compiler/src/ixd/Mapper/CodeToYamlMapper.cs

@@ -4,6 +4,7 @@
 using CommandLine;
 using Ix.ixc_doc.Helpers;
 using Ix.ixc_doc.Schemas;
+using System.Xml.Linq;
 
 
 namespace Ix.ixc_doc.Mapper
@@ -20,8 +21,8 @@ public Item PopulateItem(IDeclaration declaration)
         {
             return new Item
             {
-                Uid = declaration.FullyQualifiedName,
-                Id = declaration.Name,
+                Uid = _yh.GetBaseUid(declaration),
+                Id =  declaration.Name,
                 Name = declaration.Name,
                 FullName = declaration.Name,
                 Namespace = declaration.ContainingNamespace?.Name,
@@ -32,7 +33,7 @@ public Item PopulateItem(IDeclaration declaration)
 
         public Item PopulateItem(INamespaceDeclaration namespaceDeclaration)
         {
-            var children = namespaceDeclaration.Declarations.Select(p => p.FullyQualifiedName);
+            var children = namespaceDeclaration.Declarations.Select(p => _yh.GetBaseUid(p));
 
             var item = PopulateItem((IDeclaration)namespaceDeclaration);
             item.Children = children.ToArray();
@@ -43,7 +44,7 @@ public Item PopulateItem(INamespaceDeclaration namespaceDeclaration)
 
         public Item PopulateItem(IClassDeclaration classDeclaration)
         {
-            var children = classDeclaration.Fields.Select(p => p.FullyQualifiedName);
+            var children = classDeclaration.Fields.Select(p => _yh.GetBaseUid(p));
             var methods = classDeclaration.Methods.Select(p => _yh.GetMethodUId(p));
 
             List<IFieldDeclaration> extendedFields = new List<IFieldDeclaration>();
@@ -93,6 +94,7 @@ public Item PopulateItem(IMethodDeclaration methodDeclaration)
 
             var item = PopulateItem((IDeclaration)methodDeclaration);
             item.Uid = _yh.GetMethodUId(methodDeclaration);
+            item.Id = _yh.GetMethodId(methodDeclaration);
             item.Parent = methodDeclaration.ContainingClass.FullyQualifiedName;
             item.Type = "Method";
             item.Syntax = new Syntax

src/ix.compiler/src/ixd/Visitors/YamlBuilder.cs

@@ -38,7 +38,7 @@ public virtual void CreateNamespaceYaml(INamespaceDeclaration namespaceDeclarati
             //populate item of namepsace
             var item = _mp.PopulateItem(namespaceDeclaration);
             // create toc item
-            var tocSchemaItem = new TocSchema.Item(namespaceDeclaration.FullyQualifiedName, namespaceDeclaration.Name);
+            var tocSchemaItem = new TocSchema.Item(_yh.GetBaseUid(namespaceDeclaration), namespaceDeclaration.Name);
 
             // add to namespace group if is not global
             if (namespaceDeclaration.FullyQualifiedName != "$GLOBAL")