DynamoDS
diff --git a/‎src/DynamoCore/Graph/Workspaces/SerializationConverters.cs
Copy file name to clipboard
+73-31Lines changed: 73 additions & 31 deletions b/‎src/DynamoCore/Graph/Workspaces/SerializationConverters.cs
Copy file name to clipboard
+73-31Lines changed: 73 additions & 31 deletions
diff --git a/‎src/DynamoCore/Graph/Workspaces/WorkspaceModel.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/DynamoCore/Graph/Workspaces/WorkspaceModel.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎test/DynamoCoreTests/DynamoCoreTests.csproj
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions b/‎test/DynamoCoreTests/DynamoCoreTests.csproj
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎test/DynamoCoreTests/NodeMigrationTests.cs
Copy file name to clipboard
+32-1Lines changed: 32 additions & 1 deletion b/‎test/DynamoCoreTests/NodeMigrationTests.cs
Copy file name to clipboard
+32-1Lines changed: 32 additions & 1 deletion
diff --git a/‎test/pkgs/Dynamo Samples/bin/SampleLibraryUI.dll
Copy file name to clipboard
16 KB b/‎test/pkgs/Dynamo Samples/bin/SampleLibraryUI.dll
Copy file name to clipboard
16 KB
diff --git a/‎test/pkgs/Dynamo Samples/bin/SampleLibraryZeroTouch.Migrations.xml
Copy file name to clipboard
+15Lines changed: 15 additions & 0 deletions b/‎test/pkgs/Dynamo Samples/bin/SampleLibraryZeroTouch.Migrations.xml
Copy file name to clipboard
+15Lines changed: 15 additions & 0 deletions
diff --git a/‎test/pkgs/Dynamo Samples/bin/SampleLibraryZeroTouch.dll
Copy file name to clipboard
13.5 KB b/‎test/pkgs/Dynamo Samples/bin/SampleLibraryZeroTouch.dll
Copy file name to clipboard
13.5 KB
@@ -36,20 +36,35 @@ public class NodeReadConverter : JsonConverter
     {
         private CustomNodeManager manager;
         private LibraryServices libraryServices;
+        private NodeFactory nodeFactory;
         private bool isTestMode;
 
-        
         public ElementResolver ElementResolver { get; set; }
-        //map of all loaded assemblies including LoadFrom context assemblies
+        // Map of all loaded assemblies including LoadFrom context assemblies
         private Dictionary<string, List<Assembly>> loadedAssemblies;
 
+        [Obsolete("This constructor will be removed in Dynamo 3.0, please use new NodeReadConverter constructor with additional parameters to support node migration.")]
         public NodeReadConverter(CustomNodeManager manager, LibraryServices libraryServices, bool isTestMode = false)
         {
             this.manager = manager;
             this.libraryServices = libraryServices;
             this.isTestMode = isTestMode;
-            //we only do this in test mode because it should not be required-
-            //see comment below in NodeReadConverter.ReadJson - and it could be slow.
+            // We only do this in test mode because it should not be required-
+            // see comment below in NodeReadConverter.ReadJson - and it could be slow.
+            if (this.isTestMode)
+            {
+                this.loadedAssemblies = this.buildMapOfLoadedAssemblies();
+            }
+        }
+
+        public NodeReadConverter(CustomNodeManager manager, LibraryServices libraryServices, NodeFactory nodeFactory, bool isTestMode = false)
+        {
+            this.manager = manager;
+            this.libraryServices = libraryServices;
+            this.nodeFactory = nodeFactory;
+            this.isTestMode = isTestMode;
+            // We only do this in test mode because it should not be required-
+            // see comment below in NodeReadConverter.ReadJson - and it could be slow.
             if (this.isTestMode)
             {
                 this.loadedAssemblies = this.buildMapOfLoadedAssemblies();
@@ -84,17 +99,17 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 
             var obj = JObject.Load(reader);
             var type = Type.GetType(obj["$type"].Value<string>());
-            //if we can't find this type - try to look in our load from assemblies,
-            //but only during testing - this is required during testing because some dlls are loaded
-            //using Assembly.LoadFrom using the assemblyHelper - which loads dlls into loadFrom context - 
-            //dlls loaded with LoadFrom context cannot be found using Type.GetType() - this should
-            //not be an issue during normal dynamo use but if it is we can enable this code.
+            // If we can't find this type - try to look in our load from assemblies,
+            // but only during testing - this is required during testing because some dlls are loaded
+            // using Assembly.LoadFrom using the assemblyHelper - which loads dlls into loadFrom context - 
+            // dlls loaded with LoadFrom context cannot be found using Type.GetType() - this should
+            // not be an issue during normal dynamo use but if it is we can enable this code.
             if(type == null && this.isTestMode == true)
             {
                 List<Assembly> resultList;
 
                 var typeName = obj["$type"].Value<string>().Split(',').FirstOrDefault();
-                //this assemblyName does not usually contain version information...
+                // This assemblyName does not usually contain version information...
                 var assemblyName = obj["$type"].Value<string>().Split(',').Skip(1).FirstOrDefault().Trim();
                 if (assemblyName != null)
                 {
@@ -106,6 +121,21 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
                 }
             }
 
+            // Check for and attempt to resolve an unknown type before proceeding
+            if (type == null)
+            {
+                // Attempt to resolve the type using `AlsoKnownAs`
+                var unresolvedName = obj["$type"].Value<string>().Split(',').FirstOrDefault();
+                Type newType;
+                nodeFactory.ResolveType(unresolvedName, out newType);
+
+                // If resolved update the type
+                if (newType != null)
+                {
+                    type = newType;
+                }
+            }
+
             // If the id is not a guid, makes a guid based on the id of the node
             var guid = GuidUtility.tryParseOrCreateGuid(obj["Id"].Value<string>());
 
@@ -118,10 +148,13 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
             string assemblyLocation = objectType.Assembly.Location;
 
             bool remapPorts = true;
+
+            // If type is still null at this point return a dummy node
             if (type == null)
             {
                 node = CreateDummyNode(obj, assemblyLocation, inPorts, outPorts);
             }
+            // Attempt to create a valid node using the type
             else if (type == typeof(Function))
             {
                 var functionId = Guid.Parse(obj["FunctionSignature"].Value<string>());
@@ -169,7 +202,17 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
             else if (typeof(DSFunctionBase).IsAssignableFrom(type))
             {
                 var mangledName = obj["FunctionSignature"].Value<string>();
+                var priorNames = libraryServices.GetPriorNames();
                 var functionDescriptor = libraryServices.GetFunctionDescriptor(mangledName);
+                string newName;
+
+                // Update the function descriptor if a newer migrated version of the node exists
+                if (priorNames.TryGetValue(mangledName, out newName))
+                {
+                    functionDescriptor = libraryServices.GetFunctionDescriptor(newName);
+                }
+
+                // Use the functionDescriptor to try and restore the proper node if possible
                 if (functionDescriptor == null)
                 {
                     node = CreateDummyNode(obj, assemblyLocation, inPorts, outPorts);
@@ -257,7 +300,7 @@ private static void RemapPorts(NodeModel node, PortModel[] inPorts, PortModel[]
         {
             foreach (var p in node.InPorts)
             {
-                //check that the port index is not out of range of the loaded ports
+                // Check that the port index is not out of range of the loaded ports
                 if (p.Index < inPorts.Length)
                 {
                     var deserializedPort = inPorts[p.Index];
@@ -277,7 +320,7 @@ private static void RemapPorts(NodeModel node, PortModel[] inPorts, PortModel[]
             }
             foreach (var p in node.OutPorts)
             {
-                //check that the port index is not out of range of the loaded ports
+                // Check that the port index is not out of range of the loaded ports
                 if (p.Index < outPorts.Length)
                 {
                     var deserializedPort = outPorts[p.Index];
@@ -298,7 +341,7 @@ private static void RemapPorts(NodeModel node, PortModel[] inPorts, PortModel[]
 
         private static void setPortDataOnNewPort(PortModel newPort, PortModel deserializedPort )
         {
-            //set the appropriate properties on the new port.
+            // Set the appropriate properties on the new port.
             newPort.GUID = deserializedPort.GUID;
             newPort.UseLevels = deserializedPort.UseLevels;
             newPort.Level = deserializedPort.Level;
@@ -376,7 +419,6 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
             var nmc = (NodeReadConverter)serializer.Converters.First(c => c is NodeReadConverter);
             nmc.ElementResolver = elementResolver;
 
-            // nodes
             var nodes = obj["Nodes"].ToObject<IEnumerable<NodeModel>>(serializer);
 
             // Setting Inputs
@@ -385,7 +427,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
             if (inputsToken != null)
             {
                 var inputs = inputsToken.ToArray().Select(x => x.ToObject<NodeInputData>()).ToList();
-                //using the inputs lets set the correct properties on the nodes.
+                // Use the inputs to set the correct properties on the nodes.
                 foreach (var inputData in inputs)
                 {
                     var matchingNode = nodes.Where(x => x.GUID == inputData.Id).FirstOrDefault();
@@ -402,7 +444,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
             if (outputsToken != null)
             {
                 var outputs = outputsToken.ToArray().Select(x => x.ToObject<NodeOutputData>()).ToList();
-                //using the inputs lets set the correct properties on the nodes.
+                // Use the outputs to set the correct properties on the nodes.
                 foreach (var outputData in outputs)
                 {
                     var matchingNode = nodes.Where(x => x.GUID == outputData.Id).FirstOrDefault();
@@ -490,12 +532,12 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
                 info.Category = obj["Category"].Value<string>();
             }
 
-            //Build an empty annotations. Annotations are defined in the view block. If the file has View block
-            //serialize view block first and build the annotations.
+            // Build an empty annotations. Annotations are defined in the view block. If the file has View block
+            // serialize view block first and build the annotations.
             var annotations = new List<AnnotationModel>();
 
-            //Build an empty notes. Notes are defined in the view block. If the file has View block
-            //serialize view block first and build the notes.
+            // Build an empty notes. Notes are defined in the view block. If the file has View block
+            // serialize view block first and build the notes.
             var notes = new List<NoteModel>();
 
             #region Restore trace data
@@ -602,29 +644,29 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
             writer.WritePropertyName("Name");
             writer.WriteValue(ws.Name);
 
-            //element resolver
+            // Element resolver
             writer.WritePropertyName("ElementResolver");
             serializer.Serialize(writer, ws.ElementResolver);
 
-            //inputs
+            // Inputs
             writer.WritePropertyName("Inputs");
-            //find nodes which are inputs and get their inputData if its not null.
+            // Find nodes which are inputs and get their inputData if its not null.
             var inputNodeDatas = ws.Nodes.Where((node) => node.IsSetAsInput == true && node.InputData != null)
                 .Select(inputNode => inputNode.InputData).ToList();
             serializer.Serialize(writer, inputNodeDatas);
 
-            //outputs
+            // Outputs
             writer.WritePropertyName("Outputs");
-            //find nodes which are outputs and get their outputData if its not null.
+            // Find nodes which are outputs and get their outputData if its not null.
             var outputNodeDatas = ws.Nodes.Where((node) => node.IsSetAsOutput == true && node.OutputData != null)
                 .Select(outputNode => outputNode.OutputData).ToList();
             serializer.Serialize(writer, outputNodeDatas);
 
-            //nodes
+            // Nodes
             writer.WritePropertyName("Nodes");
             serializer.Serialize(writer, ws.Nodes);
 
-            //connectors
+            // Connectors
             writer.WritePropertyName("Connectors");
             serializer.Serialize(writer, ws.Connectors);
 
@@ -659,7 +701,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
                 var nodeTraceDataList = engine.LiveRunnerRuntimeCore.RuntimeData.GetTraceDataForNodes(nodeGuids,
                     this.engine.LiveRunnerRuntimeCore.DSExecutable);
 
-                // serialize given node-data-list pairs into an Json.
+                // Serialize given node-data-list pairs into an Json.
                 if (nodeTraceDataList.Any())
                 {
                     foreach (var pair in nodeTraceDataList)
@@ -782,7 +824,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
                 endPort = (PortModel)resolver.ResolveReferenceFromMap(serializer.Context, endIdGuid.ToString());
             }
 
-            //if the id is not a guid, makes a guid based on the id of the model
+            // If the id is not a guid, makes a guid based on the id of the model
             Guid connectorId = GuidUtility.tryParseOrCreateGuid(obj["Id"].Value<string>());
             if(startPort != null && endPort != null)
             {
@@ -948,7 +990,7 @@ public object ResolveReference(object context, string reference)
             Guid id;
             if (!Guid.TryParse(reference, out id))
             {
-                //if this is not a guid, it won't be in the resolver.
+                // If this is not a guid, it won't be in the resolver.
                 Console.WriteLine("not a guid");
                 return null;
             }
@@ -970,7 +1012,7 @@ public object ResolveReferenceFromMap(object context, string reference)
             Guid id;
             if (!Guid.TryParse(reference, out id))
             {
-                //if this is not a guid, it won't be in the resolver.
+                // If this is not a guid, it won't be in the resolver.
                 Console.WriteLine("not a guid");
                 return null;
             }
 
@@ -1653,7 +1653,7 @@ public static WorkspaceModel FromJson(string json, LibraryServices libraryServic
                 Converters = new List<JsonConverter>{
                         new ConnectorConverter(logger),
                         new WorkspaceReadConverter(engineController, scheduler, factory, isTestMode, verboseLogging),
-                        new NodeReadConverter(manager, libraryServices,isTestMode),
+                        new NodeReadConverter(manager, libraryServices, factory, isTestMode),
                         new TypedParameterConverter()
                     },
                 ReferenceResolverProvider = () => { return new IdReferenceResolver(); }
 
@@ -153,6 +153,10 @@
       <Name>DynamoCore</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\src\DynamoPackages\DynamoPackages.csproj">
+      <Project>{47533b7c-0e1a-44a4-8511-b438645f052a}</Project>
+      <Name>DynamoPackages</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Engine\ProtoAssociative\ProtoAssociative.csproj">
       <Project>{7318d5e5-9d15-4abe-8a51-92f58d4f0b85}</Project>
       <Name>ProtoAssociative</Name>
 
@@ -1,13 +1,15 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using NUnit.Framework;
+using SystemTestServices;
 using System.Xml;
 using CoreNodeModels;
 using CoreNodeModels.Input;
 using CoreNodeModels.Logic;
 using Dynamo.Graph.Nodes;
 using Dynamo.Graph.Nodes.ZeroTouch;
+using Dynamo.PackageManager;
+using NUnit.Framework;
 using PythonNodeModels;
 
 namespace Dynamo.Tests
@@ -2242,6 +2244,35 @@ public void TestSaveDontCorruptForDeprecatedNodes()
         }
         #endregion
 
+        #region Dynamo Package Node Migration Tests
+        [Test]
+        [Category("UnitTests")]
+        public void TestPackageNodeMigrationForJSONGraphs()
+        {
+            // Define package loading reference paths
+            var dir = SystemTestBase.GetTestDirectory(ExecutingDirectory);
+            var pkgDir = Path.Combine(dir, "pkgs\\Dynamo Samples");
+            var legacyGraph = Path.Combine(pkgDir, "extra\\LegacyPackageSampleGraph.dyn");
+            var pkgMan = this.CurrentDynamoModel.GetPackageManagerExtension();
+            var loader = pkgMan.PackageLoader;
+            var pkg = loader.ScanPackageDirectory(pkgDir);
+
+            // Load the sample package which includes migrations
+            loader.Load(pkg);
+
+            // Assert expected package was loaded
+            Assert.AreEqual(pkg.Name, "Dynamo Samples");
+
+            // Load the legacy graph, which contains 4 ZeroTouch/NodeModel test cases that use
+            // old class names than were renamed in the version of the package we are loading.
+            // Verify these nodes don't appear as dummy nodes and are successfully migrated.
+            TestMigration(legacyGraph);
+
+            // Verify all 4 nodes exist in the workspace and were properly loaded/opened from above
+            Assert.AreEqual(4, this.CurrentDynamoModel.CurrentWorkspace.Nodes.Count());
+        }
+        #endregion
+
         #region Private Helper Methods
 
         private string GetDynPath(string sourceDynFile)
 
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<migrations>
+  <priorNameHint>
+    <oldName>Examples.BasicExample.Create@Autodesk.DesignScript.Geometry.Point</oldName>
+    <newName>Examples.NEWBasicExample.Create@Autodesk.DesignScript.Geometry.Point</newName>
+  </priorNameHint>
+  <priorNameHint>
+    <oldName>Examples.BasicExample.Create@double,double,double</oldName>
+    <newName>Examples.NEWBasicExample.Create@double,double,double</newName>
+  </priorNameHint>
+  <priorNameHint>
+    <oldName>Examples.BasicExample.MultiReturnExample</oldName>
+    <newName>Examples.NEWBasicExample.MultiReturnExample</newName>
+  </priorNameHint>
+</migrations>