Rename stacktraces project

sleeuwen · sleeuwen · commit 341f1265050e · 2020-04-27T11:30:43.000+02:00
diff --git a/Sample/Sample.csproj b/Sample/Sample.csproj
@@ -5,18 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\SourceMaps.JavaScriptStackTraces\SourceMaps.JavaScriptStackTraces.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <Content Update="wwwroot\js\math.js">
-        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      </Content>
-      <Content Update="wwwroot\js\index.js">
-        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      </Content>
+      <ProjectReference Include="..\SourceMaps.StackTraces\SourceMaps.StackTraces.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/SourceMaps.JavaScriptStackTraces/AssemblyInfo.cs b/SourceMaps.JavaScriptStackTraces/AssemblyInfo.cs
diff --git a/SourceMaps.StackTraces.Tests/Helper.cs b/SourceMaps.StackTraces.Tests/Helper.cs
@@ -1,4 +1,4 @@
-namespace SourceMaps.JavaScriptStackTraces.Tests
+namespace SourceMaps.StackTraces.Tests
 {
     internal static class Helper
     {
diff --git a/SourceMaps.StackTraces.Tests/SourceMaps.StackTraces.Tests.csproj b/SourceMaps.StackTraces.Tests/SourceMaps.StackTraces.Tests.csproj
@@ -2,7 +2,6 @@
 
     <PropertyGroup>
         <TargetFramework>netcoreapp3.1</TargetFramework>
-
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
@@ -15,7 +14,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\SourceMaps.JavaScriptStackTraces\SourceMaps.JavaScriptStackTraces.csproj" />
+      <ProjectReference Include="..\SourceMaps.StackTraces\SourceMaps.StackTraces.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/SourceMaps.StackTraces.Tests/StackTraceParserTests.cs b/SourceMaps.StackTraces.Tests/StackTraceParserTests.cs
@@ -1,10 +1,9 @@
 using System;
 using System.Collections.Generic;
 using FluentAssertions;
-using SourceMaps.StackTraces;
 using Xunit;
 
-namespace SourceMaps.JavaScriptStackTraces.Tests
+namespace SourceMaps.StackTraces.Tests
 {
     public class StackTraceParserTests
     {
diff --git a/SourceMaps.StackTraces/AssemblyInfo.cs b/SourceMaps.StackTraces/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("SourceMaps.StackTraces.Tests")]
diff --git a/SourceMaps.StackTraces/SourceMaps.StackTraces.csproj b/SourceMaps.StackTraces/SourceMaps.StackTraces.csproj
@@ -2,7 +2,6 @@
 
     <PropertyGroup>
         <TargetFramework>netcoreapp3.1</TargetFramework>
-        <RootNamespace>SourceMaps.StackTraces</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/SourceMaps.StackTraces/StackFrame.cs b/SourceMaps.StackTraces/StackFrame.cs
diff --git a/SourceMaps.StackTraces/StackTrace.cs b/SourceMaps.StackTraces/StackTrace.cs
diff --git a/SourceMaps.StackTraces/StackTraceParser.cs b/SourceMaps.StackTraces/StackTraceParser.cs
@@ -9,23 +9,25 @@ public static string ReTrace(SourceMapCollection sourceMaps, string stacktrace,
         {
             var trace = Parse(stacktrace);
 
-            for (var i = 0; i < trace.Frames.Count; i++)
+            foreach (var frame in trace.Frames)
             {
-                var frame = trace.Frames[i];
-
-                frame.File = frame.File.Replace(sourceRoot, "");
+                if (!string.IsNullOrEmpty(sourceRoot))
+                    frame.File = frame.File.Replace(sourceRoot, "");
 
                 var sourceMap = sourceMaps.GetSourceMapFor(frame.File)
                                 ?? sourceMaps.GetSourceMapFor(frame.File.Substring(0, frame.File.IndexOf('?')));
 
+                if (frame.LineNumber == null || frame.ColumnNumber == null)
+                    continue;
+
                 var originalPosition = sourceMap?.OriginalPositionFor(new SourcePosition(frame.LineNumber.Value - 1, frame.ColumnNumber.Value - 1));
                 if (originalPosition == null)
                     continue;
 
-                frame.File = originalPosition?.OriginalFileName;
-                frame.Method = originalPosition?.OriginalName;
-                frame.LineNumber = originalPosition?.OriginalSourcePosition.LineNumber;
-                frame.ColumnNumber = originalPosition?.OriginalSourcePosition.ColumnNumber;
+                frame.File = originalPosition?.OriginalFileName ?? frame.File;
+                frame.Method = originalPosition?.OriginalName ?? frame.Method;
+                frame.LineNumber = originalPosition?.OriginalSourcePosition.LineNumber ?? frame.LineNumber;
+                frame.ColumnNumber = originalPosition?.OriginalSourcePosition.ColumnNumber ?? frame.ColumnNumber;
             }
 
             return trace.ToString();
diff --git a/SourceMaps.sln b/SourceMaps.sln
@@ -4,11 +4,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceMaps", "SourceMaps\So
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceMaps.Tests", "SourceMaps.Tests\SourceMaps.Tests.csproj", "{AECB0298-2B75-48B1-BC7F-A0A9B9DC674E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceMaps.JavaScriptStackTraces", "SourceMaps.JavaScriptStackTraces\SourceMaps.JavaScriptStackTraces.csproj", "{1D602CA0-92B6-46F2-83BC-AEABC4A7BF9D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceMaps.StackTraces", "SourceMaps.StackTraces\SourceMaps.StackTraces.csproj", "{1D602CA0-92B6-46F2-83BC-AEABC4A7BF9D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample", "Sample\Sample.csproj", "{089B0500-1D8F-43DC-A1FA-F1C0D84A8713}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceMaps.JavaScriptStackTraces.Tests", "SourceMaps.JavaScriptStackTraces.Tests\SourceMaps.JavaScriptStackTraces.Tests.csproj", "{3B8F2B23-9F06-41F8-8469-58A9A46F3BB3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceMaps.StackTraces.Tests", "SourceMaps.StackTraces.Tests\SourceMaps.StackTraces.Tests.csproj", "{3B8F2B23-9F06-41F8-8469-58A9A46F3BB3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/SourceMaps/SourceMapCollection.cs b/SourceMaps/SourceMapCollection.cs
@@ -11,14 +11,20 @@ public void Register(SourceMap sourceMap)
             _sourceMaps.Add(sourceMap.File, sourceMap);
         }
 
-        public void Register(string filepath, SourceMap sourceMap)
+        public void Register(string name, SourceMap sourceMap)
         {
-            _sourceMaps.Add(filepath, sourceMap);
+            _sourceMaps.Add(name, sourceMap);
         }
 
-        public void ParseAndRegister(string filepath, string sourceMapContent)
+        public void ParseAndRegister(string sourceMapContent)
         {
-            _sourceMaps.Add(filepath, SourceMapParser.Parse(sourceMapContent));
+            var sourceMap = SourceMapParser.Parse(sourceMapContent);
+            _sourceMaps.Add(sourceMap.File, sourceMap);
+        }
+
+        public void ParseAndRegister(string name, string sourceMapContent)
+        {
+            _sourceMaps.Add(name, SourceMapParser.Parse(sourceMapContent));
         }
 
         public SourceMap GetSourceMapFor(string filename)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace SourceMaps.JavaScriptStackTraces.Tests`
	`1`	`+namespace SourceMaps.StackTraces.Tests`
`2`	`2`	`{`
`3`	`3`	`internal static class Helper`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,9 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using FluentAssertions;`
`4`		`-using SourceMaps.StackTraces;`
`5`	`4`	`using Xunit;`
`6`	`5`
`7`		`-namespace SourceMaps.JavaScriptStackTraces.Tests`
	`6`	`+namespace SourceMaps.StackTraces.Tests`
`8`	`7`	`{`
`9`	`8`	`public class StackTraceParserTests`
`10`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+using System.Runtime.CompilerServices;`
	`2`	`+`
	`3`	`+[assembly: InternalsVisibleTo("SourceMaps.StackTraces.Tests")]`