chore: refactor dom Object and JavaScript

Author: vinniefalco

include/mrdox/Support/Dom.hpp

@@ -50,16 +50,16 @@ class StringLiteral
         return { data_, size_ };
     }
 
-    std::string_view const&
+    std::string_view
     get() const noexcept
     {
-        return { data_, size_ };
+        return std::string_view(*this);
     }
 
-    std::string_view const&
+    std::string_view
     operator*() const noexcept
     {
-        return get();
+        return std::string_view(*this);
     }
 };
 

include/mrdox/Support/String.hpp

@@ -264,7 +264,7 @@ class DomJavadoc : public dom::LazyObjectImpl
     dom::Object
     construct() const override
     {
-        entries_type list;
+        storage_type list;
         list.reserve(2);
 
         // brief

source/-adoc/AdocCorpus.cpp

@@ -199,8 +199,6 @@ createContext(
     SymbolID const& id)
 {
     return dom::Object({
-        { "document", "test" },
-        { "test", "===" },
         { "symbol", domCorpus_.get(id) }
         });
 }

source/-adoc/Builder.cpp

@@ -110,7 +110,7 @@ static
 dom::Object
 domCreate(SourceInfo const& I)
 {
-    dom::Object::entries_type entries;
+    dom::Object::storage_type entries;
     if(I.DefLoc)
         entries.emplace_back("def", domCreate(*I.DefLoc));
     if(! I.Loc.empty())
@@ -338,7 +338,7 @@ domCreate(
 {
     if(! I)
         return nullptr;
-    dom::Object::entries_type entries = {
+    dom::Object::storage_type entries = {
         { "kind", toString(I->Kind) }
     };
     visit(*I, [&]<typename T>(const T& t)
@@ -623,7 +623,7 @@ requires std::derived_from<T, Info>
 dom::Object
 DomInfo<T>::construct() const
 {
-    entries_type entries;
+    storage_type entries;
     entries.insert(entries.end(), {
         { "id",         toBase16(I_.id) },
         { "kind",       toString(I_.Kind) },

source/Metadata/DomMetadata.cpp

@@ -12,11 +12,15 @@
 #include <mrdox/Support/Error.hpp>
 #include <mrdox/Support/RangeFor.hpp>
 #include <algorithm>
+#include <ranges>
 
 namespace clang {
 namespace mrdox {
 namespace dom {
 
+static_assert(std::random_access_iterator<Object::iterator>);
+static_assert(std::ranges::random_access_range<Object>);
+
 //------------------------------------------------
 //
 // Array
@@ -119,12 +123,22 @@ Object(
 
 Object::
 Object(
-    entries_type list)
+    storage_type list)
     : impl_(std::make_shared<
         DefaultObjectImpl>(std::move(list)))
 {
 }
 
+auto
+Object::
+at(size_type i) const ->
+    reference
+{
+    if(i >= size())
+        throw Error("out of range");
+    return impl_->get(i);
+}
+
 std::string
 toString(
     Object const& obj)
@@ -134,14 +148,14 @@ toString(
     std::string s = "{";
     {
         auto insert = std::back_inserter(s);
-        for(auto const& kv : RangeFor(obj.entries()))
+        for(auto const& kv : RangeFor(obj))
         {
             if(! kv.first)
                 s.push_back(',');
             fmt::format_to(insert,
                 " {} : {}",
-                kv.value.first,
-                toStringChild(kv.value.second));
+                kv.value.key,
+                toStringChild(kv.value.value));
         }
     }
     s += " }";
@@ -159,69 +173,57 @@ DefaultObjectImpl() noexcept = default;
 
 DefaultObjectImpl::
 DefaultObjectImpl(
-    entries_type entries) noexcept
+    storage_type entries) noexcept
     : entries_(std::move(entries))
 {
 }
 
 std::size_t
 DefaultObjectImpl::
-size() const noexcept
+size() const
 {
     return entries_.size();
 }
 
-bool
+auto
 DefaultObjectImpl::
-exists(
-    std::string_view key) const
+get(std::size_t i) const ->
+    reference
 {
-    return std::find_if(
-        entries_.begin(), entries_.end(),
-        [key](value_type const& kv)
-        {
-            return kv.first == key;
-        }) != entries_.end();
+    MRDOX_ASSERT(i < entries_.size());
+    return entries_[i];
 }
 
 Value
 DefaultObjectImpl::
-get(std::string_view key) const
+find(std::string_view key) const
 {
     auto it = std::find_if(
         entries_.begin(), entries_.end(),
-        [key](value_type const& kv)
+        [key](auto const& kv)
         {
-            return kv.first == key;
+            return kv.key == key;
         });
-    if(it != entries_.end())
-        return it->second;
-    return nullptr;
+    if(it == entries_.end())
+        return nullptr;
+    return it->value;
 }
 
 void
 DefaultObjectImpl::
 set(std::string_view key, Value value)
 {
-    auto it =  std::find_if(
+    auto it = std::find_if(
         entries_.begin(), entries_.end(),
-        [key](value_type const& kv)
+        [key](auto const& kv)
         {
-            return kv.first == key;
+            return kv.key == key;
         });
     if(it == entries_.end())
         entries_.emplace_back(
             key, std::move(value));
     else
-        it->second = std::move(value);
-}
-
-auto
-DefaultObjectImpl::
-entries() const ->
-    entries_type
-{
-    return entries_;
+        it->value = std::move(value);
 }
 
 //------------------------------------------------
@@ -246,24 +248,24 @@ obj() const
 
 std::size_t
 LazyObjectImpl::
-size() const noexcept
+size() const
 {
     return obj().size();
 }
 
-bool
+auto
 LazyObjectImpl::
-exists(
-    std::string_view key) const
+get(std::size_t i) const ->
+    reference
 {
-    return obj().exists(key);
+    return obj().get(i);
 }
 
 Value
 LazyObjectImpl::
-get(std::string_view key) const
+find(std::string_view key) const
 {
-    return obj().get(key);
+    return obj().find(key);
 }
 
 void
@@ -274,14 +276,6 @@ set(
     obj().set(key, value);
 }
 
-auto
-LazyObjectImpl::
-entries() const ->
-    entries_type
-{
-    return obj().entries();
-}
-
 //------------------------------------------------
 //
 // Value