Update to WiX Intermediate Representation

26 files changed, 133 insertions, 40 deletions

diff --git a/src/WixToolset.Extensibility/BinderExtensionBase.cs b/src/WixToolset.Extensibility/BinderExtensionBase.cs
index a0b34a31..f3f3d63b 100644
--- a/src/WixToolset.Extensibility/BinderExtensionBase.cs
+++ b/src/WixToolset.Extensibility/BinderExtensionBase.cs
@@ -21,7 +21,7 @@ namespace WixToolset.Extensibility
         /// <summary>
         /// Called after variable resolution occurs.
         /// </summary>
-        public virtual void AfterResolvedFields(Output output)
+        public virtual void AfterResolvedFields(Intermediate intermediate)
         {
         }
 
diff --git a/src/WixToolset.Extensibility/CompilerExtension.cs b/src/WixToolset.Extensibility/CompilerExtension.cs
index 522ffcf8..d0bb4a10 100644
--- a/src/WixToolset.Extensibility/CompilerExtension.cs
+++ b/src/WixToolset.Extensibility/CompilerExtension.cs
@@ -4,6 +4,7 @@ namespace WixToolset.Extensibility
 {
     using System.Collections.Generic;
     using System.Xml.Linq;
+    using WixToolset.Data;
 
     /// <summary>
     /// Base class for creating a compiler extension.
@@ -25,7 +26,7 @@ namespace WixToolset.Extensibility
         /// <summary>
         /// Called at the beginning of the compilation of a source file.
         /// </summary>
-        public virtual void Initialize()
+        public virtual void PreCompile(ICompileContext context)
         {
         }
 
@@ -67,7 +68,7 @@ namespace WixToolset.Extensibility
         /// <summary>
         /// Called at the end of the compilation of a source file.
         /// </summary>
-        public virtual void Finish()
+        public virtual void PostCompile(Intermediate intermediate)
         {
         }
     }
diff --git a/src/WixToolset.Extensibility/DecompilerExtension.cs b/src/WixToolset.Extensibility/DecompilerExtension.cs
index 00277639..b492cf3a 100644
--- a/src/WixToolset.Extensibility/DecompilerExtension.cs
+++ b/src/WixToolset.Extensibility/DecompilerExtension.cs
@@ -4,6 +4,7 @@ namespace WixToolset.Extensibility
 {
     using WixToolset.Data;
 
+#if BRING_BACK_LATER
     /// <summary>
     /// Base class for creating a decompiler extension.
     /// </summary>
@@ -56,4 +57,5 @@ namespace WixToolset.Extensibility
         {
         }
     }
+#endif
 }
diff --git a/src/WixToolset.Extensibility/ExtensionData.cs b/src/WixToolset.Extensibility/ExtensionData.cs
index 4cf262b9..0cd0c420 100644
--- a/src/WixToolset.Extensibility/ExtensionData.cs
+++ b/src/WixToolset.Extensibility/ExtensionData.cs
@@ -8,6 +8,7 @@ namespace WixToolset.Extensibility
     using System.Xml;
     using WixToolset.Data;
 
+#if BRING_BACK_LATER
     public abstract class ExtensionData : IExtensionData
     {
         /// <summary>
@@ -72,4 +73,5 @@ namespace WixToolset.Extensibility
             }
         }
     }
+#endif
 }
diff --git a/src/WixToolset.Extensibility/ExtensionHelper.cs b/src/WixToolset.Extensibility/ExtensionHelper.cs
index 9c1ca950..6b938a65 100644
--- a/src/WixToolset.Extensibility/ExtensionHelper.cs
+++ b/src/WixToolset.Extensibility/ExtensionHelper.cs
@@ -10,6 +10,7 @@ namespace WixToolset.Extensibility
     using WixToolset.Data;
     using WixToolset.Extensibility;
 
+#if BRING_BACK_LATER
     /// <summary>
     /// The main class for a WiX extension.
     /// </summary>
@@ -50,4 +51,5 @@ namespace WixToolset.Extensibility
             }
         }
     }
+#endif
 }
diff --git a/src/WixToolset.Extensibility/IBackend.cs b/src/WixToolset.Extensibility/IBackend.cs
index e38de544..9b950364 100644
--- a/src/WixToolset.Extensibility/IBackend.cs
+++ b/src/WixToolset.Extensibility/IBackend.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Extensibility
     {
         BindResult Bind(IBindContext context);
 
-        Output Unbind(IUnbindContext context);
+        Intermediate Unbind(IUnbindContext context);
 
         bool Inscribe(IInscribeContext context);
     }
diff --git a/src/WixToolset.Extensibility/IBindVariableResolver.cs b/src/WixToolset.Extensibility/IBindVariableResolver.cs
index 4c2c3003..f584f327 100644
--- a/src/WixToolset.Extensibility/IBindVariableResolver.cs
+++ b/src/WixToolset.Extensibility/IBindVariableResolver.cs
@@ -3,7 +3,7 @@
 namespace WixToolset.Extensibility
 {
     using WixToolset.Data;
-    using WixToolset.Data.Rows;
+    using WixToolset.Data.Tuples;
 
     public interface IBindVariableResolver
     {
@@ -11,7 +11,7 @@ namespace WixToolset.Extensibility
 
         void AddVariable(string name, string value);
 
-        void AddVariable(WixVariableRow wixVariableRow);
+        void AddVariable(WixVariableTuple wixVariableRow);
 
         string ResolveVariables(SourceLineNumber sourceLineNumbers, string value, bool localizationOnly);
 
diff --git a/src/WixToolset.Extensibility/IBinderCore.cs b/src/WixToolset.Extensibility/IBinderCore.cs
index a4044c11..dd3fa3fe 100644
--- a/src/WixToolset.Extensibility/IBinderCore.cs
+++ b/src/WixToolset.Extensibility/IBinderCore.cs
@@ -22,7 +22,7 @@ namespace WixToolset.Extensibility
         /// Gets the table definitions used by the Binder.
         /// </summary>
         /// <value>Table definitions used by the binder.</value>
-        TableDefinitionCollection TableDefinitions { get; }
+        //TableDefinitionCollection TableDefinitions { get; }
 
         /// <summary>
         /// Generate an identifier by hashing data from the row.
diff --git a/src/WixToolset.Extensibility/IBinderExtension.cs b/src/WixToolset.Extensibility/IBinderExtension.cs
index 9673d60e..0e9df10b 100644
--- a/src/WixToolset.Extensibility/IBinderExtension.cs
+++ b/src/WixToolset.Extensibility/IBinderExtension.cs
@@ -19,7 +19,7 @@ namespace WixToolset.Extensibility
         /// <summary>
         /// Called after variable resolution occurs.
         /// </summary>
-        void AfterResolvedFields(Output output);
+        void AfterResolvedFields(Intermediate intermediate);
 
         string ResolveFile(string source, string type, SourceLineNumber sourceLineNumbers, BindStage bindStage);
 
diff --git a/src/WixToolset.Extensibility/IBinderFileManagerCore.cs b/src/WixToolset.Extensibility/IBinderFileManagerCore.cs
index c6d46e11..b73acb6b 100644
--- a/src/WixToolset.Extensibility/IBinderFileManagerCore.cs
+++ b/src/WixToolset.Extensibility/IBinderFileManagerCore.cs
@@ -18,13 +18,13 @@ namespace WixToolset.Extensibility
         /// Gets or sets the active subStorage used for binding.
         /// </summary>
         /// <value>The subStorage object.</value>
-        SubStorage ActiveSubStorage { get; }
+        //SubStorage ActiveSubStorage { get; }
 
         /// <summary>
         /// Gets or sets the output object used for binding.
         /// </summary>
         /// <value>The output object.</value>
-        Output Output { get; }
+        Intermediate Intermediate { get; }
 
         /// <summary>
         /// Gets or sets the path to the temp files location.
diff --git a/src/WixToolset.Extensibility/ICompileContext.cs b/src/WixToolset.Extensibility/ICompileContext.cs
new file mode 100644
index 00000000..d48e9539
--- /dev/null
+++ b/src/WixToolset.Extensibility/ICompileContext.cs
@@ -0,0 +1,26 @@
+// 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;
+    using System.Xml.Linq;
+    using WixToolset.Data;
+
+    public interface ICompileContext
+    {
+        IServiceProvider ServiceProvider { get; }
+
+        Messaging Messaging { get; set; }
+
+        string CompilationId { get; set; }
+
+        IEnumerable<ICompilerExtension> Extensions { get; set; }
+
+        string OutputPath { get; set; }
+
+        Platform Platform { get; set; }
+
+        XDocument Source { get; set; }
+    }
+}
diff --git a/src/WixToolset.Extensibility/ICompilerCore.cs b/src/WixToolset.Extensibility/ICompilerCore.cs
index b2ad6abd..d71f9cbe 100644
--- a/src/WixToolset.Extensibility/ICompilerCore.cs
+++ b/src/WixToolset.Extensibility/ICompilerCore.cs
@@ -62,7 +62,7 @@ namespace WixToolset.Extensibility
         /// <param name="tableName">Name of table to create row in.</param>
         /// <param name="identifier">Optional identifier for the row.</param>
         /// <returns>New row.</returns>
-        Row CreateRow(SourceLineNumber sourceLineNumbers, string tableName, Identifier identifier = null);
+        IntermediateTuple CreateRow(SourceLineNumber sourceLineNumbers, string tableName, Identifier identifier = null);
 
         /// <summary>
         /// Creates directories using the inline directory syntax.
diff --git a/src/WixToolset.Extensibility/ICompilerExtension.cs b/src/WixToolset.Extensibility/ICompilerExtension.cs
index edd7aa15..1746a571 100644
--- a/src/WixToolset.Extensibility/ICompilerExtension.cs
+++ b/src/WixToolset.Extensibility/ICompilerExtension.cs
@@ -4,18 +4,21 @@ namespace WixToolset.Extensibility
 {
     using System.Collections.Generic;
     using System.Xml.Linq;
+    using WixToolset.Data;
+    using WixToolset.Extensibility.Services;
 
     /// <summary>
     /// Interface all compiler extensions implement.
     /// </summary>
     public interface ICompilerExtension
     {
+#if false
         /// <summary>
         /// Gets or sets the compiler core for the extension.
         /// </summary>
         /// <value>Compiler core for the extension.</value>
         ICompilerCore Core { get; set; }
-
+#endif
         /// <summary>
         /// Gets the schema namespace for this extension.
         /// </summary>
@@ -25,7 +28,7 @@ namespace WixToolset.Extensibility
         /// <summary>
         /// Called at the beginning of the compilation of a source file.
         /// </summary>
-        void Initialize();
+        void PreCompile(ICompileContext context);
 
         /// <summary>
         /// Processes an attribute for the Compiler.
@@ -54,6 +57,6 @@ namespace WixToolset.Extensibility
         /// <summary>
         /// Called at the end of the compilation of a source file.
         /// </summary>
-        void Finish();
+        void PostCompile(Intermediate intermediate);
     }
 }
diff --git a/src/WixToolset.Extensibility/IDecompilerCore.cs b/src/WixToolset.Extensibility/IDecompilerCore.cs
index d18d5170..1c367e0c 100644
--- a/src/WixToolset.Extensibility/IDecompilerCore.cs
+++ b/src/WixToolset.Extensibility/IDecompilerCore.cs
@@ -47,7 +47,7 @@ namespace WixToolset.Extensibility
         /// </summary>
         /// <param name="row">The row corresponding to the element.</param>
         /// <returns>The indexed element.</returns>
-        Wix.ISchemaElement GetIndexedElement(Row row);
+        Wix.ISchemaElement GetIndexedElement(IntermediateTuple row);
 
         /// <summary>
         /// Gets the element corresponding to the primary key of the given table.
@@ -62,12 +62,12 @@ namespace WixToolset.Extensibility
         /// </summary>
         /// <param name="row">The row corresponding to the element.</param>
         /// <param name="element">The element to index.</param>
-        void IndexElement(Row row, Wix.ISchemaElement element);
+        void IndexElement(IntermediateTuple row, Wix.ISchemaElement element);
 
-            /// <summary>
+        /// <summary>
         /// Indicates the decompiler encountered and unexpected table to decompile.
         /// </summary>
         /// <param name="table">Unknown decompiled table.</param>
-        void UnexpectedTable(Table table);
+        void UnexpectedTable(string table);
 }
 }
diff --git a/src/WixToolset.Extensibility/IDecompilerExtension.cs b/src/WixToolset.Extensibility/IDecompilerExtension.cs
index 6124f348..1574f964 100644
--- a/src/WixToolset.Extensibility/IDecompilerExtension.cs
+++ b/src/WixToolset.Extensibility/IDecompilerExtension.cs
@@ -19,31 +19,31 @@ namespace WixToolset.Extensibility
         /// Gets the table definitions this extension decompiles.
         /// </summary>
         /// <value>Table definitions this extension decompiles.</value>
-        TableDefinitionCollection TableDefinitions { get; }
+        //TableDefinitionCollection TableDefinitions { get; }
 
         /// <summary>
         /// Gets the library that this decompiler wants removed from the decomipiled output.
         /// </summary>
         /// <param name="tableDefinitions">The table definitions to use while loading the library.</param>
         /// <returns>The library for this extension or null if there is no library to be removed.</returns>
-        Library GetLibraryToRemove(TableDefinitionCollection tableDefinitions);
+        //Library GetLibraryToRemove(TableDefinitionCollection tableDefinitions);
 
         /// <summary>
         /// Called at the beginning of the decompilation of a database.
         /// </summary>
         /// <param name="tables">The collection of all tables.</param>
-        void Initialize(TableIndexedCollection tables);
+        //void Initialize(TableIndexedCollection tables);
 
         /// <summary>
         /// Decompiles an extension table.
         /// </summary>
         /// <param name="table">The table to decompile.</param>
-        void DecompileTable(Table table);
+        //void DecompileTable(Table table);
 
         /// <summary>
         /// Finalize decompilation.
         /// </summary>
         /// <param name="tables">The collection of all tables.</param>
-        void Finish(TableIndexedCollection tables);
+        //void Finish(TableIndexedCollection tables);
     }
 }
diff --git a/src/WixToolset.Extensibility/IDelayedField.cs b/src/WixToolset.Extensibility/IDelayedField.cs
index a6cc7a2e..e06dbe59 100644
--- a/src/WixToolset.Extensibility/IDelayedField.cs
+++ b/src/WixToolset.Extensibility/IDelayedField.cs
@@ -6,8 +6,8 @@ namespace WixToolset.Extensibility
 
     public interface IDelayedField
     {
-        Field Field { get; }
+        IntermediateField Field { get; }
 
-        Row Row { get; }
+        IntermediateTuple Row { get; }
     }
 }
\ No newline at end of file
diff --git a/src/WixToolset.Extensibility/IExtensionData.cs b/src/WixToolset.Extensibility/IExtensionData.cs
index 19e23590..f0e339d4 100644
--- a/src/WixToolset.Extensibility/IExtensionData.cs
+++ b/src/WixToolset.Extensibility/IExtensionData.cs
@@ -10,22 +10,24 @@ namespace WixToolset.Extensibility
     public interface IExtensionData
     {
         /// <summary>
-        /// Gets the table definitions for this extension.
-        /// </summary>
-        /// <value>Table definisions for this extension or null if there are no table definitions.</value>
-        TableDefinitionCollection TableDefinitions { get; }
-
-        /// <summary>
         /// Gets the optional default culture.
         /// </summary>
         /// <value>The optional default culture.</value>
         string DefaultCulture { get; }
 
         /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="tupleDefinition"></param>
+        /// <returns>True </returns>
+        bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition);
+
+        /// <summary>
         /// Gets the library associated with this extension.
         /// </summary>
         /// <param name="tableDefinitions">The table definitions to use while loading the library.</param>
         /// <returns>The library for this extension or null if there is no library.</returns>
-        Library GetLibrary(TableDefinitionCollection tableDefinitions);
+        Library GetLibrary(ITupleDefinitionCreator tupleDefinitions);
     }
 }
diff --git a/src/WixToolset.Extensibility/IInspectorExtension.cs b/src/WixToolset.Extensibility/IInspectorExtension.cs
index b2a098b7..6c4be1e5 100644
--- a/src/WixToolset.Extensibility/IInspectorExtension.cs
+++ b/src/WixToolset.Extensibility/IInspectorExtension.cs
@@ -46,7 +46,7 @@ namespace WixToolset.Extensibility
         /// transforms are the primary transforms you'll typically want to inspect
         /// and contain your changes to target products.
         /// </remarks>
-        void InspectOutput(Output output);
+        void InspectOutput(Intermediate output);
 
         /// <summary>
         /// Inspect the final output after binding.
@@ -54,6 +54,6 @@ namespace WixToolset.Extensibility
         /// <param name="filePath">The file path to the final bound output.</param>
         /// <param name="pdb">The <see cref="Pdb"/> that contains source line numbers
         /// for the database and all rows.</param>
-        void InspectDatabase(string filePath, Pdb pdb);
+        void InspectDatabase(string filePath, Intermediate pdb);
     }
 }
diff --git a/src/WixToolset.Extensibility/ILibrarianExtension.cs b/src/WixToolset.Extensibility/ILibrarianExtension.cs
index 08d37607..ae4529d8 100644
--- a/src/WixToolset.Extensibility/ILibrarianExtension.cs
+++ b/src/WixToolset.Extensibility/ILibrarianExtension.cs
@@ -10,6 +10,6 @@ namespace WixToolset.Extensibility
 
         string Resolve(SourceLineNumber sourceLineNumber, string table, string path);
 
-        void PostCombine(Library library);
+        void PostCombine(Intermediate library);
     }
 }
diff --git a/src/WixToolset.Extensibility/ILibraryContext.cs b/src/WixToolset.Extensibility/ILibraryContext.cs
index 4e13696b..b8c1887a 100644
--- a/src/WixToolset.Extensibility/ILibraryContext.cs
+++ b/src/WixToolset.Extensibility/ILibraryContext.cs
@@ -2,18 +2,27 @@
 
 namespace WixToolset.Extensibility
 {
+    using System;
     using System.Collections.Generic;
     using WixToolset.Data;
 
     public interface ILibraryContext
     {
+        IServiceProvider ServiceProvider { get; }
+
+        Messaging Messaging { get; set; }
+
         bool BindFiles { get; set; }
 
+        IEnumerable<BindPath> BindPaths { get; set; }
+
         IEnumerable<ILibrarianExtension> Extensions { get; set; }
 
+        string LibraryId { get; set; }
+
         IEnumerable<Localization> Localizations { get; set; }
 
-        IEnumerable<Section> Sections { get; set; }
+        IEnumerable<Intermediate> Intermediates { get; set; }
 
         IBindVariableResolver WixVariableResolver { get; set; }
     }
diff --git a/src/WixToolset.Extensibility/ILinkerExtension.cs b/src/WixToolset.Extensibility/ILinkerExtension.cs
new file mode 100644
index 00000000..cb82720a
--- /dev/null
+++ b/src/WixToolset.Extensibility/ILinkerExtension.cs
@@ -0,0 +1,23 @@
+// 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;
+    using WixToolset.Extensibility.Services;
+
+    /// <summary>
+    /// Interface all binder extensions implement.
+    /// </summary>
+    public interface ILinkerExtension
+    {
+        /// <summary>
+        /// Called before linking occurs.
+        /// </summary>
+        void PreLink(ILinkContext context);
+
+        /// <summary>
+        /// Called after all linking occurs.
+        /// </summary>
+        void PostLink(Intermediate intermediate);
+    }
+}
diff --git a/src/WixToolset.Extensibility/IUnbinderExtension.cs b/src/WixToolset.Extensibility/IUnbinderExtension.cs
index 88bf20d9..0e9a2504 100644
--- a/src/WixToolset.Extensibility/IUnbinderExtension.cs
+++ b/src/WixToolset.Extensibility/IUnbinderExtension.cs
@@ -13,6 +13,6 @@ namespace WixToolset.Extensibility
         /// <summary>
         /// Called during the generation of sectionIds for an admin image.
         /// </summary>
-        void GenerateSectionIds(Output output);
+        void GenerateSectionIds(Intermediate output);
     }
 }
diff --git a/src/WixToolset.Extensibility/IWindowsInstallerBackendExtension.cs b/src/WixToolset.Extensibility/IWindowsInstallerBackendExtension.cs
index 3b01cc0d..f6ffc69c 100644
--- a/src/WixToolset.Extensibility/IWindowsInstallerBackendExtension.cs
+++ b/src/WixToolset.Extensibility/IWindowsInstallerBackendExtension.cs
@@ -3,8 +3,8 @@
 namespace WixToolset.Extensibility
 {
     using System.Collections.Generic;
-    using WixToolset.Data.Rows;
     using WixToolset.Data.Bind;
+    using WixToolset.Data.Tuples;
     using WixToolset.Extensibility.Services;
 
     /// <summary>
@@ -19,7 +19,7 @@ namespace WixToolset.Extensibility
 
         ResolvedCabinet ResolveCabinet(string cabinetPath, IEnumerable<BindFileWithPath> files);
 
-        string ResolveMedia(MediaRow mediaRow, string mediaLayoutDirectory, string layoutDirectory);
+        string ResolveMedia(MediaTuple mediaRow, string mediaLayoutDirectory, string layoutDirectory);
 
         /// <summary>
         /// Called after all output changes occur and right before the output is bound into its final format.
diff --git a/src/WixToolset.Extensibility/InspectorExtension.cs b/src/WixToolset.Extensibility/InspectorExtension.cs
index 82b1ef02..49c3f9de 100644
--- a/src/WixToolset.Extensibility/InspectorExtension.cs
+++ b/src/WixToolset.Extensibility/InspectorExtension.cs
@@ -6,6 +6,7 @@ namespace WixToolset.Extensibility
     using System.IO;
     using WixToolset.Data;
 
+#if BRING_THIS_BACK
     /// <summary>
     /// Opitonal base class for inspector extensions.
     /// </summary>
@@ -58,4 +59,5 @@ namespace WixToolset.Extensibility
         {
         }
     }
+#endif
 }
diff --git a/src/WixToolset.Extensibility/Services/IBindContext.cs b/src/WixToolset.Extensibility/Services/IBindContext.cs
index ce78709b..6bed0ef6 100644
--- a/src/WixToolset.Extensibility/Services/IBindContext.cs
+++ b/src/WixToolset.Extensibility/Services/IBindContext.cs
@@ -34,7 +34,7 @@ namespace WixToolset.Extensibility.Services
 
         string IntermediateFolder { get; set; }
 
-        Output IntermediateRepresentation { get; set; }
+        Intermediate IntermediateRepresentation { get; set; }
 
         string OutputPath { get; set; }
 
diff --git a/src/WixToolset.Extensibility/Services/ILinkContext.cs b/src/WixToolset.Extensibility/Services/ILinkContext.cs
new file mode 100644
index 00000000..8c5b3c65
--- /dev/null
+++ b/src/WixToolset.Extensibility/Services/ILinkContext.cs
@@ -0,0 +1,21 @@
+// 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.Services
+{
+    using System;
+    using System.Collections.Generic;
+    using WixToolset.Data;
+
+    public interface ILinkContext
+    {
+        IServiceProvider ServiceProvider { get; }
+
+        Messaging Messaging { get; set; }
+
+        IEnumerable<ILinkerExtension> Extensions { get; set; }
+
+        OutputType ExpectedOutputType { get; set; }
+
+        IEnumerable<Intermediate> Intermediates { get; set; }
+    }
+}