Better abstract extension factory, tuple to table creation and others

4 files changed, 67 insertions, 1 deletions

diff --git a/src/WixToolset.Extensibility/BaseCompilerExtension.cs b/src/WixToolset.Extensibility/BaseCompilerExtension.cs
index 58efa37f..abe2f4a9 100644
--- a/src/WixToolset.Extensibility/BaseCompilerExtension.cs
+++ b/src/WixToolset.Extensibility/BaseCompilerExtension.cs
@@ -31,7 +31,7 @@ namespace WixToolset.Extensibility
         /// Gets the schema namespace for this extension.
         /// </summary>
         /// <value>Schema namespace supported by this extension.</value>
-        public XNamespace Namespace { get; protected set; }
+        public abstract XNamespace Namespace { get; }
 
         /// <summary>
         /// Called at the beginning of the compilation of a source file.
diff --git a/src/WixToolset.Extensibility/BaseExtensionData.cs b/src/WixToolset.Extensibility/BaseExtensionData.cs
new file mode 100644
index 00000000..ddcec873
--- /dev/null
+++ b/src/WixToolset.Extensibility/BaseExtensionData.cs
@@ -0,0 +1,25 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Extensibility
+{
+    using WixToolset.Data;
+
+    /// <summary>
+    /// Base class for creating a resolver extension.
+    /// </summary>
+    public abstract class BaseExtensionData : IExtensionData
+    {
+        public virtual string DefaultCulture => null;
+
+        public virtual Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions)
+        {
+            return null;
+        }
+
+        public virtual bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition)
+        {
+            tupleDefinition = null;
+            return false;
+        }
+    }
+}
diff --git a/src/WixToolset.Extensibility/BaseExtensionFactory.cs b/src/WixToolset.Extensibility/BaseExtensionFactory.cs
new file mode 100644
index 00000000..2e7fdbb8
--- /dev/null
+++ b/src/WixToolset.Extensibility/BaseExtensionFactory.cs
@@ -0,0 +1,31 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Extensibility
+{
+    using System;
+    using System.Collections.Generic;
+
+    /// <summary>
+    /// Base class for extension factories.
+    /// </summary>
+    public abstract class BaseExtensionFactory : IExtensionFactory
+    {
+        protected abstract IEnumerable<Type> ExtensionTypes { get; }
+
+        public virtual bool TryCreateExtension(Type extensionType, out object extension)
+        {
+            extension = null;
+
+            foreach (var type in this.ExtensionTypes)
+            {
+                if (extensionType.IsAssignableFrom(type))
+                {
+                    extension = Activator.CreateInstance(type);
+                    break;
+                }
+            }
+
+            return extension != null;
+        }
+    }
+}
diff --git a/src/WixToolset.Extensibility/BaseWindowsInstallerBackendExtension.cs b/src/WixToolset.Extensibility/BaseWindowsInstallerBackendExtension.cs
index 0bcfce01..50e34288 100644
--- a/src/WixToolset.Extensibility/BaseWindowsInstallerBackendExtension.cs
+++ b/src/WixToolset.Extensibility/BaseWindowsInstallerBackendExtension.cs
@@ -24,6 +24,11 @@ namespace WixToolset.Extensibility
         /// </summary>
         protected IWindowsInstallerBackendHelper BackendHelper { get; private set; }
 
+        /// <summary>
+        /// Optional table definitions to automatically map to tuples.
+        /// </summary>
+        protected virtual TableDefinition[] TableDefinitionsForTuples { get; }
+
         public virtual void PreBackendBind(IBindContext context)
         {
             this.Context = context;
@@ -43,6 +48,11 @@ namespace WixToolset.Extensibility
 
         public virtual bool TryAddTupleToOutput(IntermediateTuple tuple, Output output)
         {
+            if (this.TableDefinitionsForTuples != null)
+            {
+                return this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(tuple, output, this.TableDefinitionsForTuples);
+            }
+
             return false;
         }