Fix IExtensionCommandLine and IPreprocessorExtension

3 files changed, 118 insertions, 1 deletions

diff --git a/src/WixToolset.Extensibility/Services/IParseCommandLine.cs b/src/WixToolset.Extensibility/Services/IParseCommandLine.cs
new file mode 100644
index 00000000..1b23be14
--- /dev/null
+++ b/src/WixToolset.Extensibility/Services/IParseCommandLine.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.Collections.Generic;
+
+    public interface IParseCommandLine
+    {
+        bool IsSwitch(string arg);
+
+        bool IsSwitchAt(IEnumerable<string> args, int index);
+
+        void GetNextArgumentOrError(ref string arg);
+
+        void GetNextArgumentOrError(IList<string> args);
+
+        void GetNextArgumentAsFilePathOrError(IList<string> args, string fileType);
+
+        bool TryGetNextArgumentOrError(out string arg);
+    }
+}
diff --git a/src/WixToolset.Extensibility/Services/IParseHelper.cs b/src/WixToolset.Extensibility/Services/IParseHelper.cs
index 46ade2e1..ad15c063 100644
--- a/src/WixToolset.Extensibility/Services/IParseHelper.cs
+++ b/src/WixToolset.Extensibility/Services/IParseHelper.cs
@@ -8,7 +8,7 @@ namespace WixToolset.Extensibility.Services
     using WixToolset.Data;
 
     /// <summary>
-    /// Core interface provided by the compiler.
+    /// Interface provided to help compiler extensions parse.
     /// </summary>
     public interface IParseHelper
     {
@@ -243,6 +243,13 @@ namespace WixToolset.Extensibility.Services
         YesNoDefaultType GetAttributeYesNoDefaultValue(SourceLineNumber sourceLineNumbers, XAttribute attribute);
 
         /// <summary>
+        /// Gets a source line number for an element.
+        /// </summary>
+        /// <param name="element">Element to get source line number.</param>
+        /// <returns>Source line number.</returns>
+        SourceLineNumber GetSourceLineNumbers(XElement element);
+
+        /// <summary>
         /// Gets node's inner text and ensure's it is safe for use in a condition by trimming any extra whitespace.
         /// </summary>
         /// <param name="node">The node to ensure inner text is a condition.</param>
diff --git a/src/WixToolset.Extensibility/Services/IPreprocessHelper.cs b/src/WixToolset.Extensibility/Services/IPreprocessHelper.cs
new file mode 100644
index 00000000..01c55009
--- /dev/null
+++ b/src/WixToolset.Extensibility/Services/IPreprocessHelper.cs
@@ -0,0 +1,89 @@
+// 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.Xml.Linq;
+
+    /// <summary>
+    /// Interface provided to help preprocessor extensions.
+    /// </summary>
+    public interface IPreprocessHelper
+    {
+        /// <summary>
+        /// Add a variable.
+        /// </summary>
+        /// <param name="context">The preprocess context.</param>
+        /// <param name="name">The variable name.</param>
+        /// <param name="value">The variable value.</param>
+        void AddVariable(IPreprocessContext context, string name, string value);
+
+        /// <summary>
+        /// Add a variable.
+        /// </summary>
+        /// <param name="context">The preprocess context.</param>
+        /// <param name="name">The variable name.</param>
+        /// <param name="value">The variable value.</param>
+        /// <param name="overwrite">Set to true to show variable overwrite warning.</param>
+        void AddVariable(IPreprocessContext context, string name, string value, bool showWarning);
+
+        /// <summary>
+        /// Evaluate a function.
+        /// </summary>
+        /// <param name="context">The preprocess context.</param>
+        /// <param name="function">The function expression including the prefix and name.</param>
+        /// <returns>The function value.</returns>
+        string EvaluateFunction(IPreprocessContext context, string function);
+
+        /// <summary>
+        /// Evaluate a function.
+        /// </summary>
+        /// <param name="context">The preprocess context.</param>
+        /// <param name="prefix">The function prefix.</param>
+        /// <param name="function">The function name.</param>
+        /// <param name="args">The arguments for the function.</param>
+        /// <returns>The function value or null if the function is not defined.</returns>
+        string EvaluateFunction(IPreprocessContext context, string prefix, string function, string[] args);
+
+        /// <summary>
+        /// Get the value of a variable expression like var.name.
+        /// </summary>
+        /// <param name="context">The preprocess context.</param>
+        /// <param name="variable">The variable expression including the optional prefix and name.</param>
+        /// <param name="allowMissingPrefix">true to allow the variable prefix to be missing.</param>
+        /// <returns>The variable value.</returns>
+        string GetVariableValue(IPreprocessContext context, string variable, bool allowMissingPrefix);
+
+        /// <summary>
+        /// Get the value of a variable.
+        /// </summary>
+        /// <param name="context">The preprocess context.</param>
+        /// <param name="prefix">The variable prefix.</param>
+        /// <param name="name">The variable name.</param>
+        /// <returns>The variable value or null if the variable is not set.</returns>
+        string GetVariableValue(IPreprocessContext context, string prefix, string name);
+
+        /// <summary>
+        /// Evaluate a Pragma.
+        /// </summary>
+        /// <param name="context">The preprocess context.</param>
+        /// <param name="pragmaName">The pragma's full name (<prefix>.<pragma>).</param>
+        /// <param name="args">The arguments to the pragma.</param>
+        /// <param name="parent">The parent element of the pragma.</param>
+        void PreprocessPragma(IPreprocessContext context, string pragmaName, string args, XContainer parent);
+
+        /// <summary>
+        /// Replaces parameters in the source text.
+        /// </summary>
+        /// <param name="context">The preprocess context.</param>
+        /// <param name="value">Text that may contain parameters to replace.</param>
+        /// <returns>Text after parameters have been replaced.</returns>
+        string PreprocessString(IPreprocessContext context, string value);
+
+        /// <summary>
+        /// Remove a variable.
+        /// </summary>
+        /// <param name="context">The preprocess context.</param>
+        /// <param name="name">The variable name.</param>
+        void RemoveVariable(IPreprocessContext context, string name);
+    }
+}