DynamoDS
diff --git a/‎src/DynamoCore/DynamoCore.csproj
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎src/DynamoCore/DynamoCore.csproj
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎src/DynamoCore/Extensions/ExtensionData.cs
Copy file name to clipboard
+47Lines changed: 47 additions & 0 deletions b/‎src/DynamoCore/Extensions/ExtensionData.cs
Copy file name to clipboard
+47Lines changed: 47 additions & 0 deletions
diff --git a/‎src/DynamoCore/Extensions/ExtensionManager.cs
Copy file name to clipboard
+22Lines changed: 22 additions & 0 deletions b/‎src/DynamoCore/Extensions/ExtensionManager.cs
Copy file name to clipboard
+22Lines changed: 22 additions & 0 deletions
diff --git a/‎src/DynamoCore/Extensions/IExtensionStorageAccess.cs
Copy file name to clipboard
+43Lines changed: 43 additions & 0 deletions b/‎src/DynamoCore/Extensions/IExtensionStorageAccess.cs
Copy file name to clipboard
+43Lines changed: 43 additions & 0 deletions
diff --git a/‎src/DynamoCore/Graph/ModelBase.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/DynamoCore/Graph/ModelBase.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/DynamoCore/Graph/NodeGraph.cs
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions b/‎src/DynamoCore/Graph/NodeGraph.cs
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions
diff --git a/‎src/DynamoCore/Graph/Nodes/DummyNode.cs
Copy file name to clipboard
+5-2Lines changed: 5 additions & 2 deletions b/‎src/DynamoCore/Graph/Nodes/DummyNode.cs
Copy file name to clipboard
+5-2Lines changed: 5 additions & 2 deletions
diff --git a/‎src/DynamoCore/Graph/Nodes/NodeLoaders/ZeroTouchNodeLoader.cs
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion b/‎src/DynamoCore/Graph/Nodes/NodeLoaders/ZeroTouchNodeLoader.cs
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎src/DynamoCore/Graph/Nodes/NodeModel.cs
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion b/‎src/DynamoCore/Graph/Nodes/NodeModel.cs
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion
diff --git a/‎src/DynamoCore/Graph/Nodes/ZeroTouch/DSFunctionBase.cs
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion b/‎src/DynamoCore/Graph/Nodes/ZeroTouch/DSFunctionBase.cs
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion
@@ -118,6 +118,8 @@ limitations under the License.
     <Compile Include="Engine\ShortestQualifiedNameReplacer.cs" />
     <Compile Include="Exceptions\CustomNodePackageLoadException.cs" />
     <Compile Include="Exceptions\LibraryLoadFailedException.cs" />
+    <Compile Include="Extensions\ExtensionData.cs" />
+    <Compile Include="Extensions\IExtensionStorageAccess.cs" />
     <Compile Include="Graph\Workspaces\PackageDependencyInfo.cs" />
     <Compile Include="Graph\Nodes\NodeOutputData.cs" />
     <Compile Include="Graph\Nodes\NodeInputData.cs" />
 
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+
+namespace Dynamo.Extensions
+{
+    public class ExtensionData
+    {
+        /// <summary>
+        /// Extensions unique id.
+        /// </summary>
+        public string ExtensionGuid { get; private set; }
+
+        /// <summary>
+        /// Name of extension.
+        /// </summary>
+        public string Name { get; private set; }
+
+        /// <summary>
+        /// Extension version.
+        /// </summary>
+        public string Version { get; private set; }
+
+        /// <summary>
+        /// Extension specific data.
+        /// </summary>
+        public Dictionary<string,string> Data { get; set; }
+
+        public ExtensionData(string extensionGuid, string name, string version, Dictionary<string, string> data)
+        {
+            if (string.IsNullOrEmpty(name))
+            {
+                throw new ArgumentException($"'{nameof(name)}' cannot be null or empty", nameof(name));
+            }
+
+            if (string.IsNullOrEmpty(version))
+            {
+                throw new ArgumentException($"'{nameof(version)}' cannot be null or empty", nameof(version));
+            }
+
+            ExtensionGuid = extensionGuid ?? throw new ArgumentNullException(nameof(extensionGuid));
+            Data = data ?? throw new ArgumentNullException(nameof(data));
+
+            Name = name;
+            Version = version;
+        }
+    }
+}
@@ -33,6 +33,7 @@ public interface IExtensionSource
     public class ExtensionManager: IExtensionManager, ILogSource
     {
         private readonly List<IExtension> extensions = new List<IExtension>();
+        private readonly List<IExtensionStorageAccess> storageAccessExtensions = new List<IExtensionStorageAccess>();
         private readonly ExtensionLoader extensionLoader = new ExtensionLoader();
         private readonly Dictionary<Type, KeyValuePair<string, object>> services = new Dictionary<Type, KeyValuePair<string, object>>();
 
@@ -109,6 +110,12 @@ public void Add(IExtension extension)
                 {
                     ExtensionAdded(extension);
                 }
+
+                if (extension is IExtensionStorageAccess storageAccess &&
+                    storageAccessExtensions.Find(x => x.UniqueId == extension.UniqueId) is null)
+                {
+                    storageAccessExtensions.Add(storageAccess);
+                }
             }
             else
             {
@@ -139,6 +146,12 @@ public void Remove(IExtension extension)
                 Log(fullName + " extension cannot be disposed properly: " + ex.Message);
             }
 
+            if (extension is IExtensionStorageAccess storageAccess &&
+                storageAccessExtensions.Contains(storageAccess))
+            {
+                storageAccessExtensions.Remove(storageAccess);
+            }
+
             Log(fullName + " extension is removed");
             if (ExtensionRemoved != null)
             {
@@ -154,6 +167,14 @@ public IEnumerable<IExtension> Extensions
             get { return extensions; }
         }
 
+        /// <summary>
+        /// Returns the collection of registered extensions implementing IExtensionStorageAccess
+        /// </summary>
+        public IEnumerable<IExtensionStorageAccess> StorageAccessExtensions
+        {
+            get { return storageAccessExtensions; }
+        }
+
         /// <summary>
         /// This event is fired when a new extension is added.
         /// </summary>
@@ -182,6 +203,7 @@ public void Dispose()
                 Remove(extensions[0]);
             }
 
+            storageAccessExtensions.Clear();
             extensionLoader.MessageLogged -= Log;
         }
 
 
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Dynamo.Graph;
+
+namespace Dynamo.Extensions
+{
+    public interface IExtensionStorageAccess
+    {
+        /// <summary>
+        /// A unique id for this extension instance. 
+        /// 
+        /// The id will be equivalent to the extension that implements this interface id.
+        /// </summary>
+        string UniqueId { get; }
+
+        /// <summary>
+        /// A name for the Extension.
+        /// 
+        /// The name will be equivalent to the extension that implements this interface name.
+        /// </summary>
+        string Name { get; }
+
+        /// <summary>
+        /// Action to be invoked when the workspace is opened. The passed extensionData dictionary is a copy of the <see cref="ExtensionData"/> data dictionary.
+        /// Modifying the extensionData from this action will not modify the stored <see cref="ExtensionData"/>.
+        /// To modify the stored <see cref="ExtensionData"/> data dictionary use the <see cref="OnWorkspaceSaving(Dictionary{string, string}, SaveContext)"/>.
+        /// </summary>
+        /// <param name="extensionData">A copy of the ExtensionData dictionary</param>
+        void OnWorkspaceOpen(Dictionary<string, string> extensionData);
+
+        /// <summary>
+        /// Action to be invoked when the workspace has begun its saving process.
+        /// The passed extensionData dictionary is a direct reference to the stored <see cref="ExtensionData"/> data dictionary, modifications to this dictionary
+        /// will be reflected in the stored <see cref="ExtensionData"/> data dictionary
+        /// </summary>
+        /// <param name="extensionData"></param>
+        /// <param name="saveContext"></param>
+        void OnWorkspaceSaving(Dictionary<string, string> extensionData, SaveContext saveContext);
+    }
+}
@@ -13,7 +13,7 @@ namespace Dynamo.Graph
     /// <summary>
     /// SaveContext represents several contexts, in which node can be serialized/deserialized.
     /// </summary>
-    public enum SaveContext { File, Copy, Undo, Preset, None };
+    public enum SaveContext { [Obsolete("Use Save or SaveAs, instead of File")] File, Copy, Undo, Preset, None, Save, SaveAs };
 
     /// <summary>
     /// This class encapsulates the input parameters that need to be passed into nodes
 
@@ -58,7 +58,7 @@ private static IEnumerable<NodeModel> LoadNodesFromXml(XmlDocument xmlDoc, NodeF
                 elNodes = xmlDoc.GetElementsByTagName("dynElements");
             XmlNode elNodesList = elNodes[0];
             return from XmlElement elNode in elNodesList.ChildNodes
-                   select LoadNodeFromXml(elNode, SaveContext.File, nodeFactory, resolver);
+                   select LoadNodeFromXml(elNode, SaveContext.Save, nodeFactory, resolver);
         }
 
         /// <summary>
@@ -127,7 +127,7 @@ private static IEnumerable<ConnectorModel> LoadConnectorsFromXml(XmlDocument xml
         public static NoteModel LoadNoteFromXml(XmlNode note)
         {
             var instance = new NoteModel(0, 0, string.Empty, Guid.NewGuid());
-            instance.Deserialize(note as XmlElement, SaveContext.File);
+            instance.Deserialize(note as XmlElement, SaveContext.Save);
             return instance;
         }
 
@@ -146,7 +146,7 @@ private static IEnumerable<NoteModel> LoadNotesFromXml(XmlDocument xmlDoc)
         internal static AnnotationModel LoadAnnotationFromXml(XmlNode annotation, IEnumerable<NodeModel> nodes, IEnumerable<NoteModel> notes)
         {
             var instance = new AnnotationModel(nodes,notes);             
-            instance.Deserialize(annotation as XmlElement, SaveContext.File);
+            instance.Deserialize(annotation as XmlElement, SaveContext.Save);
             return instance;
         }
 
@@ -184,7 +184,7 @@ public static IEnumerable<PresetModel> LoadPresetsFromXml(XmlDocument xmlDoc, IE
         private static PresetModel PresetFromXml(XmlElement stateNode, IEnumerable<NodeModel> nodesInNodeGraph)
         {
             var instance = new PresetModel(nodesInNodeGraph);
-            instance.Deserialize(stateNode, SaveContext.File);
+            instance.Deserialize(stateNode, SaveContext.Save);
             return instance;
         }
 
 
@@ -361,7 +361,9 @@ private void SaveNode(XmlDocument xmlDoc, XmlElement nodeElement, SaveContext co
                 }
             }
 
-            if (context == SaveContext.File)
+            if (context == SaveContext.File || 
+                context == SaveContext.Save || 
+                context == SaveContext.SaveAs)
             {
                 //When save files, only save the original node's content, 
                 //instead of saving the dummy node.
@@ -399,7 +401,8 @@ protected override XmlElement CreateElement(XmlDocument xmlDocument, SaveContext
         {
             XmlElement originalElement = OriginalXmlNodeContent;
 
-            if (context == SaveContext.File && originalElement != null)
+            if ((context == SaveContext.File || context == SaveContext.Save || context == SaveContext.SaveAs) &&
+                originalElement != null)
             {
                 XmlElement originalNode = xmlDocument.CreateElement(originalElement.Name);
                 return originalNode;
 
@@ -67,7 +67,8 @@ public NodeModel CreateNodeFromXml(XmlElement nodeElement, SaveContext context,
                 }
             }
 
-            if (context == SaveContext.File && !string.IsNullOrEmpty(assembly))
+            if ((context == SaveContext.File || context == SaveContext.Save || context == SaveContext.SaveAs) &&
+                !string.IsNullOrEmpty(assembly))
             {
                 var document = nodeElement.OwnerDocument;
                 var docPath = Nodes.Utilities.GetDocumentXmlPath(document);
 
@@ -2201,7 +2201,9 @@ protected override void SerializeCore(XmlElement element, SaveContext context)
                 helper.SetAttribute("nodeState", state.ToString());
             }
 
-            if (context == SaveContext.File)
+            if (context == SaveContext.File ||
+                context == SaveContext.Save ||
+                context == SaveContext.SaveAs)
                 OnSave();
         }
 
 
@@ -241,7 +241,9 @@ public override void SerializeCore(XmlElement element, SaveContext context)
             base.SerializeCore(element, context);
             var asmPath = Definition.Assembly ?? "";
 
-            if (context == SaveContext.File)
+            if (context == SaveContext.File ||
+                context == SaveContext.Save ||
+                context == SaveContext.SaveAs)
             {
                 // We only make relative paths in a file saving operation.
                 var docPath = Utilities.GetDocumentXmlPath(element.OwnerDocument);
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ public interface IExtensionSource`
`33`	`33`	`public class ExtensionManager: IExtensionManager, ILogSource`
`34`	`34`	`{`
`35`	`35`	`private readonly List<IExtension> extensions = new List<IExtension>();`
	`36`	`+ private readonly List<IExtensionStorageAccess> storageAccessExtensions = new List<IExtensionStorageAccess>();`
`36`	`37`	`private readonly ExtensionLoader extensionLoader = new ExtensionLoader();`
`37`	`38`	`private readonly Dictionary<Type, KeyValuePair<string, object>> services = new Dictionary<Type, KeyValuePair<string, object>>();`
`38`	`39`
`@@ -109,6 +110,12 @@ public void Add(IExtension extension)`
`109`	`110`	`{`
`110`	`111`	`ExtensionAdded(extension);`
`111`	`112`	`}`
	`113`	`+`
	`114`	`+ if (extension is IExtensionStorageAccess storageAccess &&`
	`115`	`+ storageAccessExtensions.Find(x => x.UniqueId == extension.UniqueId) is null)`
	`116`	`+ {`
	`117`	`+ storageAccessExtensions.Add(storageAccess);`
	`118`	`+ }`
`112`	`119`	`}`
`113`	`120`	`else`
`114`	`121`	`{`
`@@ -139,6 +146,12 @@ public void Remove(IExtension extension)`
`139`	`146`	`Log(fullName + " extension cannot be disposed properly: " + ex.Message);`
`140`	`147`	`}`
`141`	`148`
	`149`	`+ if (extension is IExtensionStorageAccess storageAccess &&`
	`150`	`+ storageAccessExtensions.Contains(storageAccess))`
	`151`	`+ {`
	`152`	`+ storageAccessExtensions.Remove(storageAccess);`
	`153`	`+ }`
	`154`	`+`
`142`	`155`	`Log(fullName + " extension is removed");`
`143`	`156`	`if (ExtensionRemoved != null)`
`144`	`157`	`{`
`@@ -154,6 +167,14 @@ public IEnumerable<IExtension> Extensions`
`154`	`167`	`get { return extensions; }`
`155`	`168`	`}`
`156`	`169`
	`170`	`+ /// <summary>`
	`171`	`+ /// Returns the collection of registered extensions implementing IExtensionStorageAccess`
	`172`	`+ /// </summary>`
	`173`	`+ public IEnumerable<IExtensionStorageAccess> StorageAccessExtensions`
	`174`	`+ {`
	`175`	`+ get { return storageAccessExtensions; }`
	`176`	`+ }`
	`177`	`+`
`157`	`178`	`/// <summary>`
`158`	`179`	`/// This event is fired when a new extension is added.`
`159`	`180`	`/// </summary>`
`@@ -182,6 +203,7 @@ public void Dispose()`
`182`	`203`	`Remove(extensions[0]);`
`183`	`204`	`}`
`184`	`205`
	`206`	`+ storageAccessExtensions.Clear();`
`185`	`207`	`extensionLoader.MessageLogged -= Log;`
`186`	`208`	`}`
`187`	`209`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ private static IEnumerable<NodeModel> LoadNodesFromXml(XmlDocument xmlDoc, NodeF`
`58`	`58`	`elNodes = xmlDoc.GetElementsByTagName("dynElements");`
`59`	`59`	`XmlNode elNodesList = elNodes[0];`
`60`	`60`	`return from XmlElement elNode in elNodesList.ChildNodes`
`61`		`- select LoadNodeFromXml(elNode, SaveContext.File, nodeFactory, resolver);`
	`61`	`+ select LoadNodeFromXml(elNode, SaveContext.Save, nodeFactory, resolver);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`/// <summary>`
`@@ -127,7 +127,7 @@ private static IEnumerable<ConnectorModel> LoadConnectorsFromXml(XmlDocument xml`
`127`	`127`	`public static NoteModel LoadNoteFromXml(XmlNode note)`
`128`	`128`	`{`
`129`	`129`	`var instance = new NoteModel(0, 0, string.Empty, Guid.NewGuid());`
`130`		`- instance.Deserialize(note as XmlElement, SaveContext.File);`
	`130`	`+ instance.Deserialize(note as XmlElement, SaveContext.Save);`
`131`	`131`	`return instance;`
`132`	`132`	`}`
`133`	`133`
`@@ -146,7 +146,7 @@ private static IEnumerable<NoteModel> LoadNotesFromXml(XmlDocument xmlDoc)`
`146`	`146`	`internal static AnnotationModel LoadAnnotationFromXml(XmlNode annotation, IEnumerable<NodeModel> nodes, IEnumerable<NoteModel> notes)`
`147`	`147`	`{`
`148`	`148`	`var instance = new AnnotationModel(nodes,notes);`
`149`		`- instance.Deserialize(annotation as XmlElement, SaveContext.File);`
	`149`	`+ instance.Deserialize(annotation as XmlElement, SaveContext.Save);`
`150`	`150`	`return instance;`
`151`	`151`	`}`
`152`	`152`
`@@ -184,7 +184,7 @@ public static IEnumerable<PresetModel> LoadPresetsFromXml(XmlDocument xmlDoc, IE`
`184`	`184`	`private static PresetModel PresetFromXml(XmlElement stateNode, IEnumerable<NodeModel> nodesInNodeGraph)`
`185`	`185`	`{`
`186`	`186`	`var instance = new PresetModel(nodesInNodeGraph);`
`187`		`- instance.Deserialize(stateNode, SaveContext.File);`
	`187`	`+ instance.Deserialize(stateNode, SaveContext.Save);`
`188`	`188`	`return instance;`
`189`	`189`	`}`
`190`	`190`
Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,9 @@ private void SaveNode(XmlDocument xmlDoc, XmlElement nodeElement, SaveContext co`
`361`	`361`	`}`
`362`	`362`	`}`
`363`	`363`
`364`		`- if (context == SaveContext.File)`
	`364`	`+ if (context == SaveContext.File \|\|`
	`365`	`+ context == SaveContext.Save \|\|`
	`366`	`+ context == SaveContext.SaveAs)`
`365`	`367`	`{`
`366`	`368`	`//When save files, only save the original node's content,`
`367`	`369`	`//instead of saving the dummy node.`
`@@ -399,7 +401,8 @@ protected override XmlElement CreateElement(XmlDocument xmlDocument, SaveContext`
`399`	`401`	`{`
`400`	`402`	`XmlElement originalElement = OriginalXmlNodeContent;`
`401`	`403`
`402`		`- if (context == SaveContext.File && originalElement != null)`
	`404`	`+ if ((context == SaveContext.File \|\| context == SaveContext.Save \|\| context == SaveContext.SaveAs) &&`
	`405`	`+ originalElement != null)`
`403`	`406`	`{`
`404`	`407`	`XmlElement originalNode = xmlDocument.CreateElement(originalElement.Name);`
`405`	`408`	`return originalNode;`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,8 @@ public NodeModel CreateNodeFromXml(XmlElement nodeElement, SaveContext context,`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
`70`		`- if (context == SaveContext.File && !string.IsNullOrEmpty(assembly))`
	`70`	`+ if ((context == SaveContext.File \|\| context == SaveContext.Save \|\| context == SaveContext.SaveAs) &&`
	`71`	`+ !string.IsNullOrEmpty(assembly))`
`71`	`72`	`{`
`72`	`73`	`var document = nodeElement.OwnerDocument;`
`73`	`74`	`var docPath = Nodes.Utilities.GetDocumentXmlPath(document);`
Original file line number	Diff line number	Diff line change
`@@ -2201,7 +2201,9 @@ protected override void SerializeCore(XmlElement element, SaveContext context)`
`2201`	`2201`	`helper.SetAttribute("nodeState", state.ToString());`
`2202`	`2202`	`}`
`2203`	`2203`
`2204`		`- if (context == SaveContext.File)`
	`2204`	`+ if (context == SaveContext.File \|\|`
	`2205`	`+ context == SaveContext.Save \|\|`
	`2206`	`+ context == SaveContext.SaveAs)`
`2205`	`2207`	`OnSave();`
`2206`	`2208`	`}`
`2207`	`2209`