Making ICompilation 'Emit' path async

fabiocav · fabiocav · commit f6b4c048118e · 2017-10-03T14:09:47.000-07:00
diff --git a/src/WebJobs.Script/Description/Compilation/ICompilation.cs b/src/WebJobs.Script/Description/Compilation/ICompilation.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Immutable;
 using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 
 namespace Microsoft.Azure.WebJobs.Script.Description
@@ -12,11 +13,11 @@ public interface ICompilation
     {
         ImmutableArray<Diagnostic> GetDiagnostics();
 
-        object Emit(CancellationToken cancellationToken);
+        Task<object> EmitAsync(CancellationToken cancellationToken);
     }
 
     public interface ICompilation<TOutput> : ICompilation
     {
-        new TOutput Emit(CancellationToken cancellationToken);
+        new Task<TOutput> EmitAsync(CancellationToken cancellationToken);
     }
 }
diff --git a/src/WebJobs.Script/Description/DotNet/Compilation/CSharp/CSharpCompilation.cs b/src/WebJobs.Script/Description/DotNet/Compilation/CSharp/CSharpCompilation.cs
@@ -9,6 +9,7 @@
 using System.Reflection;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.Azure.WebJobs.Script.Description.DotNet.CSharp.Analyzers;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
@@ -87,17 +88,17 @@ private static bool IsOrUsesAssemblyType(ITypeSymbol typeSymbol, IAssemblySymbol
                 && namedTypeSymbol.TypeArguments.Any(t => IsOrUsesAssemblyType(t, assemblySymbol));
         }
 
-        object ICompilation.Emit(CancellationToken cancellationToken) => Emit(cancellationToken);
+        async Task<object> ICompilation.EmitAsync(CancellationToken cancellationToken) => await EmitAsync(cancellationToken);
 
-        public Assembly Emit(CancellationToken cancellationToken)
+        public async Task<Assembly> EmitAsync(CancellationToken cancellationToken)
         {
             try
             {
                 using (var assemblyStream = new MemoryStream())
                 using (var pdbStream = new MemoryStream())
                 {
                     var compilationWithAnalyzers = _compilation.WithAnalyzers(GetAnalyzers());
-                    var diagnostics = compilationWithAnalyzers.GetAnalyzerDiagnosticsAsync().Result;
+                    var diagnostics = await compilationWithAnalyzers.GetAnalyzerDiagnosticsAsync();
                     var emitOptions = new EmitOptions().WithDebugInformationFormat(PlatformHelper.IsMono ? DebugInformationFormat.PortablePdb : DebugInformationFormat.Pdb);
                     var emitResult = compilationWithAnalyzers.Compilation.Emit(assemblyStream, pdbStream, options: emitOptions, cancellationToken: cancellationToken);
 
diff --git a/src/WebJobs.Script/Description/DotNet/Compilation/FSharp/FSharpCompilation.cs b/src/WebJobs.Script/Description/DotNet/Compilation/FSharp/FSharpCompilation.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Scripting;
 using Microsoft.CodeAnalysis.Text;
@@ -81,13 +82,13 @@ private static RefKind GetParameterRefKind(ParameterInfo x)
             return RefKind.None;
         }
 
-        object ICompilation.Emit(CancellationToken cancellationToken) => Emit(cancellationToken);
+        async Task<object> ICompilation.EmitAsync(CancellationToken cancellationToken) => await EmitAsync(cancellationToken);
 
-        public Assembly Emit(CancellationToken cancellationToken)
+        public Task<Assembly> EmitAsync(CancellationToken cancellationToken)
         {
             EnsureAssemblyOption();
 
-            return _assemblyOption.Value;
+            return Task.FromResult(_assemblyOption.Value);
         }
 
         private void EnsureAssemblyOption(bool includeDiagnostics = true)
diff --git a/src/WebJobs.Script/Description/DotNet/Compilation/Raw/RawAssemblyCompilation.cs b/src/WebJobs.Script/Description/DotNet/Compilation/Raw/RawAssemblyCompilation.cs
@@ -7,6 +7,7 @@
 using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 
 namespace Microsoft.Azure.WebJobs.Script.Description
@@ -26,11 +27,11 @@ public RawAssemblyCompilation(string assemblyFilePath, string entryPointName)
 
         public Assembly FunctionAssembly => _functionAssembly ?? (_functionAssembly = Assembly.LoadFrom(_assemblyFilePath));
 
-        object ICompilation.Emit(CancellationToken cancellationToken) => Emit(cancellationToken);
+        async Task<object> ICompilation.EmitAsync(CancellationToken cancellationToken) => await EmitAsync(cancellationToken);
 
-        public Assembly Emit(CancellationToken cancellationToken)
+        public Task<Assembly> EmitAsync(CancellationToken cancellationToken)
         {
-            return FunctionAssembly;
+            return Task.FromResult(FunctionAssembly);
         }
 
         public ImmutableArray<Diagnostic> GetDiagnostics() => ImmutableArray<Diagnostic>.Empty;
diff --git a/src/WebJobs.Script/Description/DotNet/DotNetFunctionInvoker.cs b/src/WebJobs.Script/Description/DotNet/DotNetFunctionInvoker.cs
@@ -301,7 +301,7 @@ private async Task<MethodInfo> CreateFunctionTarget(CancellationToken cancellati
                 {
                     IDotNetCompilation compilation = await _compilationService.GetFunctionCompilationAsync(Metadata);
 
-                    Assembly assembly = compilation.Emit(cancellationToken);
+                    Assembly assembly = await compilation.EmitAsync(cancellationToken);
                     _assemblyLoader.CreateOrUpdateContext(Metadata, assembly, _metadataResolver, TraceWriter, Host.ScriptConfig.HostConfig.LoggerFactory);
 
                     FunctionSignature functionSignature = compilation.GetEntryPointSignature(_functionEntryPointResolver);
diff --git a/src/WebJobs.Script/Description/Node/Compilation/ConditionalJavaScriptCompilationService.cs b/src/WebJobs.Script/Description/Node/Compilation/ConditionalJavaScriptCompilationService.cs
@@ -42,7 +42,9 @@ public async Task<IJavaScriptCompilation> GetFunctionCompilationAsync(FunctionMe
                 {
                     IJavaScriptCompilation compilation = await _compilationService.GetFunctionCompilationAsync(functionMetadata);
 
-                    await PersistCompilationResult(functionMetadata, compilation.Emit(CancellationToken.None), compilation.GetDiagnostics());
+                    string emitResult = await compilation.EmitAsync(CancellationToken.None);
+
+                    await PersistCompilationResult(functionMetadata, emitResult, compilation.GetDiagnostics());
 
                     return compilation;
                 }
@@ -150,9 +152,9 @@ public enum CompilationState
 
             public ImmutableArray<Diagnostic> GetDiagnostics() => Diagnostics?.ToImmutableArray() ?? ImmutableArray<Diagnostic>.Empty;
 
-            public string Emit(CancellationToken cancellationToken) => EmitResult;
+            public Task<string> EmitAsync(CancellationToken cancellationToken) => Task.FromResult(EmitResult);
 
-            object ICompilation.Emit(CancellationToken cancellationToken) => Emit(cancellationToken);
+            async Task<object> ICompilation.EmitAsync(CancellationToken cancellationToken) => await EmitAsync(cancellationToken);
         }
     }
 }
diff --git a/src/WebJobs.Script/Description/Node/Compilation/Raw/RawJavaScriptCompilation.cs b/src/WebJobs.Script/Description/Node/Compilation/Raw/RawJavaScriptCompilation.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Immutable;
 using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 
 namespace Microsoft.Azure.WebJobs.Script.Description
@@ -21,8 +22,8 @@ public RawJavaScriptCompilation(string scriptFilePath)
 
         public ImmutableArray<Diagnostic> GetDiagnostics() => ImmutableArray<Diagnostic>.Empty;
 
-        object ICompilation.Emit(CancellationToken cancellationToken) => Emit(cancellationToken);
+        async Task<object> ICompilation.EmitAsync(CancellationToken cancellationToken) => await EmitAsync(cancellationToken);
 
-        public string Emit(CancellationToken cancellationToken) => _scriptFilePath;
+        public Task<string> EmitAsync(CancellationToken cancellationToken) => Task.FromResult(_scriptFilePath);
     }
 }
diff --git a/src/WebJobs.Script/Description/Node/Compilation/TypeScript/TypeScriptCompilation.cs b/src/WebJobs.Script/Description/Node/Compilation/TypeScript/TypeScriptCompilation.cs
@@ -44,14 +44,16 @@ public static async Task<TypeScriptCompilation> CompileAsync(string inputFile, T
 
         public ImmutableArray<Diagnostic> GetDiagnostics() => ImmutableArray.Create(_diagnostics.ToArray());
 
-        object ICompilation.Emit(CancellationToken cancellationToken) => Emit(cancellationToken);
+        async Task<object> ICompilation.EmitAsync(CancellationToken cancellationToken) => await EmitAsync(cancellationToken);
 
-        public string Emit(CancellationToken cancellationToken)
+        public Task<string> EmitAsync(CancellationToken cancellationToken)
         {
             string relativeInputFilePath = FileUtility.GetRelativePath(_options.RootDir, _inputFilePath);
             string outputFileName = Path.ChangeExtension(relativeInputFilePath, ".js");
 
-            return Path.Combine(Path.GetDirectoryName(_inputFilePath), _options.OutDir, outputFileName);
+            string scriptPath = Path.Combine(Path.GetDirectoryName(_inputFilePath), _options.OutDir, outputFileName);
+
+            return Task.FromResult(scriptPath);
         }
     }
 }
diff --git a/src/WebJobs.Script/Description/Node/NodeFunctionInvoker.cs b/src/WebJobs.Script/Description/Node/NodeFunctionInvoker.cs
@@ -132,7 +132,7 @@ private async Task<ScriptFunc> CreateFunctionTarget(CancellationToken cancellati
             {
                 IJavaScriptCompilation compilation = await CompileAndTraceAsync(LogTargets.System, suppressCompilationSummary: true);
 
-                string functionScriptPath = compilation.Emit(cancellationToken);
+                string functionScriptPath = await compilation.EmitAsync(cancellationToken);
                 string script = string.Format(CultureInfo.InvariantCulture, _functionTemplate, functionScriptPath.Replace('\\', '/'));
 
                 return Edge.Func(script);
diff --git a/test/WebJobs.Script.Tests.Integration/Properties/Resources.Designer.cs b/test/WebJobs.Script.Tests.Integration/Properties/Resources.Designer.cs
diff --git a/test/WebJobs.Script.Tests/Description/DotNet/DotNetFunctionInvokerTests.cs b/test/WebJobs.Script.Tests/Description/DotNet/DotNetFunctionInvokerTests.cs
@@ -48,8 +48,8 @@ public async Task ReloadScript_WithInvalidCompilationAndMissingMethod_ReportsRes
             RunDependencies dependencies = CreateDependencies();
             dependencies.Compilation.Setup(c => c.GetEntryPointSignature(It.IsAny<IFunctionEntryPointResolver>()))
                 .Throws(exception);
-            dependencies.Compilation.Setup(c => c.Emit(It.IsAny<CancellationToken>()))
-                .Returns(typeof(object).Assembly);
+            dependencies.Compilation.Setup(c => c.EmitAsync(It.IsAny<CancellationToken>()))
+                .ReturnsAsync(typeof(object).Assembly);
 
             string functionName = Guid.NewGuid().ToString();
             string rootFunctionsFolder = Path.Combine(Path.GetTempPath(), functionName);
diff --git a/test/WebJobs.Script.Tests/Description/Node/Compilation/ConditionalCompilationServiceTests.cs b/test/WebJobs.Script.Tests/Description/Node/Compilation/ConditionalCompilationServiceTests.cs
@@ -33,7 +33,9 @@ public async Task GetCompilationResultAsync_WithPositivePredicate_ExecutesServic
             IJavaScriptCompilation compilation = await compilationService.GetFunctionCompilationAsync(functionMetadata);
 
             Assert.NotNull(compilation);
-            Assert.Equal("test", compilation.Emit(CancellationToken.None));
+
+            string result = await compilation.EmitAsync(CancellationToken.None);
+            Assert.Equal("test", result);
 
             innerCompilationServiceMock.Verify();
         }
@@ -75,8 +77,8 @@ public async Task GetCompilationResultAsync_WithNegativePredicate_WaitsForCached
 
             Assert.NotNull(compilation);
             Assert.NotNull(cachedCompilation);
-            Assert.Equal("positiveresult", compilation.Emit(CancellationToken.None));
-            Assert.Equal("positiveresult", cachedCompilation.Emit(CancellationToken.None));
+            Assert.Equal("positiveresult", compilation.EmitAsync(CancellationToken.None).Result);
+            Assert.Equal("positiveresult", cachedCompilation.EmitAsync(CancellationToken.None).Result);
 
             negativeTestData.CompilationServiceMock.Verify(c => c.GetFunctionCompilationAsync(It.IsAny<FunctionMetadata>()), Times.Never());
             positiveTestData.CompilationServiceMock.Verify(c => c.GetFunctionCompilationAsync(It.IsAny<FunctionMetadata>()));
@@ -104,11 +106,11 @@ public TestJavaScriptCompilation(string emitResult, ImmutableArray<Diagnostic> d
 
             public bool SupportsDiagnostics => true;
 
-            public string Emit(CancellationToken cancellationToken) => _emitResult;
+            public Task<string> EmitAsync(CancellationToken cancellationToken) => Task.FromResult(_emitResult);
 
             public ImmutableArray<Diagnostic> GetDiagnostics() => _diagnostics;
 
-            object ICompilation.Emit(CancellationToken cancellationToken) => Emit(cancellationToken);
+            async Task<object> ICompilation.EmitAsync(CancellationToken cancellationToken) => await EmitAsync(cancellationToken);
         }
     }
 }
diff --git a/test/WebJobs.Script.Tests/Description/Node/Compilation/Raw/RawJavascriptCompilationTests.cs b/test/WebJobs.Script.Tests/Description/Node/Compilation/Raw/RawJavascriptCompilationTests.cs
@@ -15,12 +15,12 @@ namespace Microsoft.Azure.WebJobs.Script.Tests.Description.Node.Compilation.Raw
     public class RawJavascriptCompilationTests
     {
         [Fact]
-        public void Emit_ReturnsScriptPath()
+        public async Task Emit_ReturnsScriptPath()
         {
             string path = @"c:\root\test\index.js";
             var compilation = new RawJavaScriptCompilation(path);
 
-            string result = compilation.Emit(CancellationToken.None);
+            string result = await compilation.EmitAsync(CancellationToken.None);
 
             Assert.Equal(path, result);
         }
diff --git a/test/WebJobs.Script.Tests/Description/Node/Compilation/TypeScript/TypeScriptCompilationTests.cs b/test/WebJobs.Script.Tests/Description/Node/Compilation/TypeScript/TypeScriptCompilationTests.cs
@@ -25,7 +25,7 @@ public async Task Emit_ReturnsExpectedPath()
             string inputFile = @"c:\root\directory\functionname\inputfile.ts";
             var compilation = await TypeScriptCompilation.CompileAsync(inputFile, options, new TestCompiler());
 
-            string result = compilation.Emit(CancellationToken.None);
+            string result = await compilation.EmitAsync(CancellationToken.None);
 
             Assert.Equal(@"c:\root\directory\functionname\outdir\functionname\inputfile.js", result);
         }
diff --git a/test/WebJobs.Script.Tests/Properties/Resources.Designer.cs b/test/WebJobs.Script.Tests/Properties/Resources.Designer.cs

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using System;`
`5`	`5`	`using System.Collections.Immutable;`
`6`	`6`	`using System.Threading;`
	`7`	`+using System.Threading.Tasks;`
`7`	`8`	`using Microsoft.CodeAnalysis;`
`8`	`9`
`9`	`10`	`namespace Microsoft.Azure.WebJobs.Script.Description`
`@@ -12,11 +13,11 @@ public interface ICompilation`
`12`	`13`	`{`
`13`	`14`	`ImmutableArray<Diagnostic> GetDiagnostics();`
`14`	`15`
`15`		`- object Emit(CancellationToken cancellationToken);`
	`16`	`+ Task<object> EmitAsync(CancellationToken cancellationToken);`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`public interface ICompilation<TOutput> : ICompilation`
`19`	`20`	`{`
`20`		`- new TOutput Emit(CancellationToken cancellationToken);`
	`21`	`+ new Task<TOutput> EmitAsync(CancellationToken cancellationToken);`
`21`	`22`	`}`
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ private async Task<MethodInfo> CreateFunctionTarget(CancellationToken cancellati`
`301`	`301`	`{`
`302`	`302`	`IDotNetCompilation compilation = await _compilationService.GetFunctionCompilationAsync(Metadata);`
`303`	`303`
`304`		`- Assembly assembly = compilation.Emit(cancellationToken);`
	`304`	`+ Assembly assembly = await compilation.EmitAsync(cancellationToken);`
`305`	`305`	`_assemblyLoader.CreateOrUpdateContext(Metadata, assembly, _metadataResolver, TraceWriter, Host.ScriptConfig.HostConfig.LoggerFactory);`
`306`	`306`
`307`	`307`	`FunctionSignature functionSignature = compilation.GetEntryPointSignature(_functionEntryPointResolver);`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,9 @@ public async Task<IJavaScriptCompilation> GetFunctionCompilationAsync(FunctionMe`
`42`	`42`	`{`
`43`	`43`	`IJavaScriptCompilation compilation = await _compilationService.GetFunctionCompilationAsync(functionMetadata);`
`44`	`44`
`45`		`- await PersistCompilationResult(functionMetadata, compilation.Emit(CancellationToken.None), compilation.GetDiagnostics());`
	`45`	`+ string emitResult = await compilation.EmitAsync(CancellationToken.None);`
	`46`	`+`
	`47`	`+ await PersistCompilationResult(functionMetadata, emitResult, compilation.GetDiagnostics());`
`46`	`48`
`47`	`49`	`return compilation;`
`48`	`50`	`}`
`@@ -150,9 +152,9 @@ public enum CompilationState`
`150`	`152`
`151`	`153`	`public ImmutableArray<Diagnostic> GetDiagnostics() => Diagnostics?.ToImmutableArray() ?? ImmutableArray<Diagnostic>.Empty;`
`152`	`154`
`153`		`- public string Emit(CancellationToken cancellationToken) => EmitResult;`
	`155`	`+ public Task<string> EmitAsync(CancellationToken cancellationToken) => Task.FromResult(EmitResult);`
`154`	`156`
`155`		`- object ICompilation.Emit(CancellationToken cancellationToken) => Emit(cancellationToken);`
	`157`	`+ async Task<object> ICompilation.EmitAsync(CancellationToken cancellationToken) => await EmitAsync(cancellationToken);`
`156`	`158`	`}`
`157`	`159`	`}`
`158`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,14 +44,16 @@ public static async Task<TypeScriptCompilation> CompileAsync(string inputFile, T`
`44`	`44`
`45`	`45`	`public ImmutableArray<Diagnostic> GetDiagnostics() => ImmutableArray.Create(_diagnostics.ToArray());`
`46`	`46`
`47`		`- object ICompilation.Emit(CancellationToken cancellationToken) => Emit(cancellationToken);`
	`47`	`+ async Task<object> ICompilation.EmitAsync(CancellationToken cancellationToken) => await EmitAsync(cancellationToken);`
`48`	`48`
`49`		`- public string Emit(CancellationToken cancellationToken)`
	`49`	`+ public Task<string> EmitAsync(CancellationToken cancellationToken)`
`50`	`50`	`{`
`51`	`51`	`string relativeInputFilePath = FileUtility.GetRelativePath(_options.RootDir, _inputFilePath);`
`52`	`52`	`string outputFileName = Path.ChangeExtension(relativeInputFilePath, ".js");`
`53`	`53`
`54`		`- return Path.Combine(Path.GetDirectoryName(_inputFilePath), _options.OutDir, outputFileName);`
	`54`	`+ string scriptPath = Path.Combine(Path.GetDirectoryName(_inputFilePath), _options.OutDir, outputFileName);`
	`55`	`+`
	`56`	`+ return Task.FromResult(scriptPath);`
`55`	`57`	`}`
`56`	`58`	`}`
`57`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ private async Task<ScriptFunc> CreateFunctionTarget(CancellationToken cancellati`
`132`	`132`	`{`
`133`	`133`	`IJavaScriptCompilation compilation = await CompileAndTraceAsync(LogTargets.System, suppressCompilationSummary: true);`
`134`	`134`
`135`		`- string functionScriptPath = compilation.Emit(cancellationToken);`
	`135`	`+ string functionScriptPath = await compilation.EmitAsync(cancellationToken);`
`136`	`136`	`string script = string.Format(CultureInfo.InvariantCulture, _functionTemplate, functionScriptPath.Replace('\\', '/'));`
`137`	`137`
`138`	`138`	`return Edge.Func(script);`