Preliminary SourceMap support (#2701)

* #include an absolute path didn't work - because paths were taken to always be relative.

* WIP source map.

* Split out handling of RttiTypeFuncs to a map type.

* Make RttiTypeFuncsMap hold default impls.

* Slightly more sophisticated RttiTypeFuncsMap

* Source map decoding.

* Fix tabs.

* Fix asserts due to negative values.

* Use less obscure mechanisms in SourceMap.

2 files changed, 99 insertions, 2 deletions

diff --git a/tools/slang-unit-test/unit-test-json-native.cpp b/tools/slang-unit-test/unit-test-json-native.cpp
index 6636cc04a..546131e4b 100644
--- a/tools/slang-unit-test/unit-test-json-native.cpp
+++ b/tools/slang-unit-test/unit-test-json-native.cpp
@@ -107,11 +107,13 @@ static SlangResult _check()
 
     DiagnosticSink sink(&sourceManager, &JSONLexer::calcLexemeLocation);
 
+    auto typeMap = JSONNativeUtil::getTypeFuncsMap(); 
+
     RefPtr<JSONContainer> container(new JSONContainer(&sourceManager));
 
     String json;
     {
-        NativeToJSONConverter converter(container, &sink);
+        NativeToJSONConverter converter(container, &typeMap, &sink);
 
         JSONValue value;
         SLANG_RETURN_ON_FAIL(converter.convert(GetRttiInfo<SomeStruct>::get(), &s, value));
@@ -143,7 +145,7 @@ static SlangResult _check()
 
     // Convert back to native
     {
-        JSONToNativeConverter converter(container, &sink);
+        JSONToNativeConverter converter(container, &typeMap, &sink);
 
         {
             SomeStruct readS;
diff --git a/tools/slang-unit-test/unit-test-source-map.cpp b/tools/slang-unit-test/unit-test-source-map.cpp
new file mode 100644
index 000000000..1b48980f8
--- /dev/null
+++ b/tools/slang-unit-test/unit-test-source-map.cpp
@@ -0,0 +1,95 @@
+
+#include "../../source/compiler-core/slang-json-lexer.h"
+#include "../../source/core/slang-string-escape-util.h"
+#include "../../source/compiler-core/slang-json-parser.h"
+#include "../../source/compiler-core/slang-json-value.h"
+
+#include "../../source/compiler-core/slang-json-native.h"
+
+#include "../../source/compiler-core/slang-source-map.h"
+
+#include "../../source/core/slang-rtti-info.h"
+
+#include "tools/unit-test/slang-unit-test.h"
+
+using namespace Slang;
+
+static SlangResult _check()
+{
+    SourceManager sourceManager;
+    sourceManager.initialize(nullptr, nullptr);
+    DiagnosticSink sink(&sourceManager, nullptr);
+
+    const char json[] = R"(
+{
+        "version" : 3,
+        "file" : "out.js",
+        "sourceRoot" : "",
+        "sources" : ["foo.js", "bar.js"],
+        "sourcesContent" : [null, null],
+        "names" : ["src", "maps", "are", "fun"],
+        "mappings" : "A,AAAB;;ABCEG;"
+}
+)";
+
+    RefPtr<JSONContainer> container = new JSONContainer(&sourceManager);
+
+    RttiTypeFuncsMap typeMap = JSONNativeUtil::getTypeFuncsMap();
+
+    JSONValue readValue;
+    {
+        // Now need to parse as JSON
+        String contents(json);
+        SourceFile* sourceFile = sourceManager.createSourceFileWithString(PathInfo::makeUnknown(), contents);
+        SourceView* sourceView = sourceManager.createSourceView(sourceFile, nullptr, SourceLoc());
+
+        JSONLexer lexer;
+        lexer.init(sourceView, &sink);
+
+        JSONBuilder builder(container);
+
+        JSONParser parser;
+        SLANG_RETURN_ON_FAIL(parser.parse(&lexer, sourceView, &builder, &sink));
+
+        readValue = builder.getRootValue();
+    }
+
+    // Convert to native
+    JSONSourceMap readS;
+    {
+        JSONToNativeConverter converter(container, &typeMap, &sink);
+
+        // Read it back
+        SLANG_RETURN_ON_FAIL(converter.convert(readValue, GetRttiInfo<JSONSourceMap>::get(), &readS));
+    }
+
+    // Write it out
+    {
+        String json;
+        
+        NativeToJSONConverter converter(container, &typeMap, &sink);
+
+        JSONValue value;
+        SLANG_RETURN_ON_FAIL(converter.convert(GetRttiInfo<JSONSourceMap>::get(), &readS, value));
+
+        // Convert into a string
+        JSONWriter writer(JSONWriter::IndentationStyle::Allman);
+        container->traverseRecursively(value, &writer);
+
+        json = writer.getBuilder();
+    }
+
+    {
+        SourceMap sourceMap;
+
+        SLANG_RETURN_ON_FAIL(sourceMap.decode(container, readS));
+    }
+
+    return SLANG_OK;
+}
+
+SLANG_UNIT_TEST(sourceMap)
+{
+    SLANG_CHECK(SLANG_SUCCEEDED(_check()));
+}
+