libyang v3: wrap stored typedef names

This will make it possible to get rid of that rather ugly hack in velia (or anywhere else when people need to know which of the possible union options is used). Change-Id: Id5639c85a07014609304f48b255107637b1f8b49

Author: jktjkt

include/libyang-cpp/Type.hpp

@@ -66,6 +66,7 @@ class LIBYANG_CPP_EXPORT Type {
  InstanceIdentifier asInstanceIdentifier() const;
 
  std::string name() const;
+ std::optional<std::string> typedefName() const;
  std::optional<std::string> description() const;
 
  std::string internalPluginId() const;

src/Type.cpp

@@ -196,6 +196,20 @@ std::string Type::name() const
  return m_typeParsed->name;
 }
 
+/**
+ * @brief Name of the typedef, if avaialable
+ *
+ * Wraps `lysc_type::name`.
+ */
+std::optional<std::string> Type::typedefName() const
+{
+ if (!m_type->name) {
+ return std::nullopt;
+ }
+
+ return m_type->name;
+}
+
 /**
  * @brief Returns the description of the type.
  *

tests/data_node.cpp

@@ -2226,7 +2226,7 @@ TEST_CASE("union data types")
  std::optional<libyang::Context> ctxWithParsed{std::in_place, std::nullopt,
  libyang::ContextOptions::SetPrivParsed | libyang::ContextOptions::NoYangLibrary | libyang::ContextOptions::DisableSearchCwd};
  ctxWithParsed->parseModule(with_inet_types_module, libyang::SchemaFormat::YANG);
- std::string input, expectedPlugin;
+ std::string input, expectedPlugin, expectedTypedef;
 
  DOCTEST_SUBCASE("IPv6")
  {
@@ -2243,21 +2243,25 @@ TEST_CASE("union data types")
  input = "::ffff:192.0.2.1";
  }
  expectedPlugin = "ipv6";
+ expectedTypedef = "ipv6-address";
  }
 
  DOCTEST_SUBCASE("IPv4")
  {
  input = "127.0.0.1";
  expectedPlugin = "ipv4";
+ expectedTypedef = "ipv4-address";
  }
 
  DOCTEST_SUBCASE("string")
  {
  input = "foo-bar.example.org";
  expectedPlugin = "string";
+ expectedTypedef = "domain-name";
  }
 
  auto node = ctxWithParsed->newPath("/with-inet-types:hostname", input);
  REQUIRE(node.asTerm().valueType().internalPluginId().find(expectedPlugin) != std::string::npos);
  REQUIRE_THROWS_AS(node.asTerm().valueType().name(), libyang::ParsedInfoUnavailable);
+ REQUIRE(node.asTerm().valueType().typedefName() == expectedTypedef);
 }