Files
logos-cpp-sdk/tests/experimental/test_impl_header_parser.cpp
T
Dario LipicarandClaude Opus 5 198f0317ca feat(optional): ?T is two-state, and the generators finally read it (#125)
* feat(optional): ?T is two-state, and the generators finally read it

No generator in any language read the optional flag — it had never been
implemented. `?T` was a HARD REJECT on the cdylib backend ("module not
cdylib-eligible"), `std::optional<T>` in an impl header fell through to the
opaque `any` with no diagnostic, and a `? name: T` field was emitted as a
required `T`. Three real contracts in the workspace already declare optionals
and were silently getting one of those three answers.

`?T` is TWO-state: a value of T, or empty. Never three — "one LIDL type <-> one
type per language" leaves nowhere for a third state, because every target has
exactly one empty inhabitant.

ONE MEANING, TWO SPELLINGS. `? name: T` (the field flag) and `name: ?T` (the
type kind) are the same declaration. Backends no longer answer that themselves:
logos-lidl's fieldIsOptional/fieldValueType are re-exported from lidl_compat.h
and every site THIS COMMIT TOUCHES reads them, so the two spellings emit
byte-identical code on the cdylib and client backends. That
caught a live drift on the way in — lidlRecordCollidesWithBytesTag read `f.type`
and so refused `? _bytes: tstr` while letting `_bytes: ?tstr` straight through,
one declaration with two answers.

THE WIRE RULE DEPENDS ON THE SLOT. Absent and explicit null are the SAME state
on decode and DIFFERENT on encode:
  - decode is liberal, by exactly one inhabitant: in an optional slot absent and
    null both mean empty; in a required slot both stay errors. A present value
    goes through the decoder a required T would get, so a wrong type still fails
    at the same path — optional widens the domain, it does not switch checking
    off. `?bstr` therefore keeps the LENIENT bytes decode a bare `bstr` gets,
    rather than silently becoming stricter in the optional slot.
  - encode has one canonical form: empty OMITS the key where the slot is NAMED
    (a record field) and is spelled null where it is POSITIONAL (an argument, a
    return, an event parameter — no key to omit, and arity must not change). Key
    omission lives in the record emitter because a Codec only ever sees a value,
    never the slot it sits in. A round trip therefore canonicalises.
  - `?any` collapses onto `any`: nlohmann::json already carries null, so
    std::optional<LogosMap> would give the slot two spellings of empty.

The dispatch gate now admits a missing trailing optional argument and
materialises it as null, exactly the way a missing record field already was. A
method with no optional parameter emits the byte-identical gate it always did.

Header-first: `std::optional<T>` <-> `?T`, composing with records and
containers. `std::optional<std::optional<T>>` has NO LIDL type (three C++ states
over a two-state wire), so it maps down to `?T` — which makes the author's own
declaration stop compiling against the generated codec, deliberately — and says
so at derivation time instead of leaving a conversion error in generated code.

The Qt/Lp consumer surface is NOT fixed and does not pretend to be. The wrappers
real modules get come from legacy/main.cpp, where the AST is flattened to a
single Qt type-name string per slot before optionality could be seen; Qt has no
optional metatype, so `?T` lands on QVariant — the right shape (an invalid
QVariant is Qt's empty inhabitant) with no type. The generator now prints a Note
naming every flattened slot so an affected build is never silent, and
docs/project.md records exactly what a Qt consumer will still do with an
optional field.

Verified by output equivalence, not by a green build: the generator was built
before and after and run over every .lidl in the workspace plus the impl-header
fixtures, in cdylib, consumer-qt, consumer-lp, client and header-first modes.
428 of 465 artefacts are byte-identical; all 37 that differ belong to one of the
four contracts that declare an optional (the 38th path is the manifest). The
harness's sensitivity is pinned by a negative control: qt vs lp output differs
in 45 files. The emitted codec was additionally compiled under -Wall -Wextra and
run against the rules above — omission, absent==null, required-still-rejects,
present-but-wrong-still-fails, and canonicalising round trip.

Tests: 199 pass, 0 fail (180 before, 19 new).

Requires logos-lidl's optionality accessors and logos-protocol's
Codec<std::optional<T>>.

NOT FIXED, AND IT IS THE PATH THAT MATTERS MOST. The legacy interface-wrapper
path is untouched, and it is the one every real module builds through
(buildPlugin.nix:145 -> logos-cpp-generator --general-only). There the two
spellings still diverge:

  ? maybe: tstr   ->  QString maybe{};   __m.value("maybe").toString()
  maybe: ?tstr    ->  QVariant maybe{};  __m.value("maybe")

and --api-style lp diverges too, neither side being std::optional. So R3 holds
on the backends below and NOT on the Qt consumer a shipping module actually
gets. logos-chat-module -- the contract that prompted this work -- uses the
field-flag spelling, so it lands on the branch that silently defaults.

The cause is upstream of codegen: legacy/main.cpp's moduleRecordsToJson and
moduleMethodsToJson flatten every TypeExpr to a single Qt TYPE-NAME STRING, so
optionality (along with nesting, map key types and descriptions) is gone before
generator_lib.cpp sees it. Widening that interface is a larger change and is
deliberately not attempted here. The only R3 test on a Qt surface covers
lidl_gen_client.cpp, which is on no live build path.

* chore: re-pin logos-lidl to master for the optionality accessors

lidl_compat.h re-exports typeIsOptional / optionalValueType / fieldIsOptional /
fieldValueType / paramIsOptional / paramValueType, which landed in
logos-lidl#7. The pinned lidl predated it, so CI failed to compile.

logos-lidl 8c95d4f -> 35f33d8. Tests: 199 pass, 0 fail.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* chore: re-pin logos-protocol to master for Codec<std::optional<T>>

The generated record codecs emit Codec<std::optional<T>> for an optional
field; that specialisation landed in logos-protocol#37 and the pinned
protocol predated it.

Note this repo's own tests would NOT have caught the omission -- the
generator tests string-assert emitted text rather than compiling it, so a
missing codec specialisation only surfaces when a real module compiles
generated optional code (logos-test-modules' ext provider).

logos-protocol 4359557 -> 72754ab. Tests: 199 pass, 0 fail.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* test(doctests): override logos-lidl alongside every logos-cpp-sdk override

The doc-tests build downstream repos (logoscore-cli, capability_module,
accounts_module) with --override-input logos-cpp-sdk. Nix does not carry the
overridden input's OWN lock, so those builds got this branch's cpp-sdk source
while still resolving logos-lidl from their own, older locks. The shipped
share/lidl-frontend/lidl_compat.h then calls accessors that lidl does not
have:

  lidl_compat.h:46: error: 'paramValueType' has not been declared in 'lidl'
  lidl_compat.h:92: error: 'fieldValueType' was not declared in this scope

Every --override-input logos-cpp-sdk now has a matching
--override-input <same-path>/logos-cpp-sdk/logos-lidl.

This is specific to the override path. A normal consumer running
'nix flake update logos-cpp-sdk' inherits cpp-sdk's own lock, which pins the
lidl carrying these accessors, and is unaffected.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* test(doctests): move logos-lidl at the qt-sdk nodes, not under logos-cpp-sdk

The doc-tests failed to build logos-qt-generator:

  share/lidl-frontend/lidl_compat.h:46: error: 'paramValueType' has not been
  declared in 'lidl'

MECHANISM. This SDK installs cpp-generator/experimental/lidl_compat.h into
$out/share/lidl-frontend/, and logos-qt-sdk's logos-qt-generator *compiles*
that installed header against qt-sdk's OWN logos-lidl input. Under
logos-qt-sdk, logos-lidl is a SIBLING of logos-cpp-sdk, not a descendant:

  logos-qt-sdk
  |-- logos-cpp-sdk   <- --override-input moves this to the commit under test
  `-- logos-lidl      <- stays on qt-sdk's lock (8c95d4f), lacks the accessors

logos-logoscore-cli and logos-module-builder both declare
`logos-qt-sdk.inputs.logos-cpp-sdk.follows = "logos-cpp-sdk"` but no lidl
follows, so overriding the SDK hands qt-sdk a new lidl_compat.h next to its
old lidl. The failing derivation is logos-qt-generator — not anything in
logos-cpp-sdk, which is why the previous attempt aimed at the wrong node.

THE FIX is one `<path-to-logos-qt-sdk>/logos-lidl` override per qt-sdk node
that ends up on the SDK under test. A tree-walk over the resolved lock found
four in logoscore-cli's closure and two per module build; with the overrides
applied the walk reports zero remaining.

WHAT WAS REMOVED, and why it was doing nothing:

  * The `.../logos-cpp-sdk/logos-lidl` overrides added in bef3ef5 were no-ops.
    With only `--override-input logos-cpp-sdk <sha>`, that node's logos-lidl
    already resolves to 35f33d87 out of cpp-sdk's own lock — nix >= 2.26
    carries an overridden input's lock, and CI runs Determinate Nix. Verified
    by resolving the lock with and without them: byte-identical.
  * The `logos-module-client/...` overrides never matched anything. Nix says so
    out loud ("does not match any input"): logoscore-cli has no such root
    input; module-client only appears under logos-test-modules/, outside the
    runtime closure. The prose claiming it pins the SDK is corrected too.

cpp-sdk-concurrent-dispatch is fixed here as well — it failed the same way and
carried no lidl overrides at all.

VERIFIED locally against bef3ef5, the exact commit CI failed on:

  * accounts .lgx  -> exit 0, logos-accounts_module-module-lib.lgx (5,939,898 B)
  * logoscore CLI  -> exit 0, ./logos/bin/logoscore reports
                      "logos-cpp-sdk bef3ef57d3f489073672e70a786c550df7edd003"
  * negative control (same command minus the single qt-sdk lidl flag) fails
    with CI's exact derivation,
    /nix/store/pf96n2ldvhy6sq39ygkh5zdqx7dcn4df-logos-qt-generator-0.1.0.drv
  * no "does not match any input" warnings remain on any command

The durable fix is a one-line bump of logos-qt-sdk's own flake.lock logos-lidl
to master (logos-lidl#7 is purely additive: six new inline helpers, nothing
removed or renamed). Once qt-sdk carries it, every override added here can go.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
2026-07-31 07:19:47 -03:00

692 lines
26 KiB
C++

#include <gtest/gtest.h>
#include <QTemporaryDir>
#include <algorithm>
#include "impl_header_parser.h"
#include <QCoreApplication>
#include <QDir>
#include <QFile>
#include <QTextStream>
// Helper: find the fixtures directory.
// 1. FIXTURES_DIR env var — set by CI to point to installed fixtures
// 2. FIXTURES_DIR compile define — set by CMake, works during ctest in nix sandbox
// 3. ../fixtures relative to binary — nix install layout ($out/bin/ + $out/fixtures/)
static QString fixturesDir()
{
// Environment variable takes priority (set by CI or user)
QByteArray envDir = qgetenv("FIXTURES_DIR");
if (!envDir.isEmpty() && QDir(envDir).exists())
return QString::fromUtf8(envDir);
#ifdef FIXTURES_DIR
if (QDir(FIXTURES_DIR).exists())
return QString(FIXTURES_DIR);
#endif
// Installed layout: $out/bin/experimental_tests + $out/fixtures/
QString binDir = QCoreApplication::applicationDirPath();
if (!binDir.isEmpty()) {
QString installed = QDir::cleanPath(binDir + "/../fixtures");
if (QDir(installed).exists())
return installed;
}
return QDir::currentPath() + "/fixtures";
}
class ImplHeaderParserTest : public ::testing::Test {
protected:
QString errOutput;
QTextStream err{&errOutput};
};
// ---------------------------------------------------------------------------
// Basic parsing
// ---------------------------------------------------------------------------
TEST_F(ImplHeaderParserTest, ParsesSampleImpl)
{
auto r = parseImplHeader(
fixturesDir() + "/sample_impl.h",
"SampleModuleImpl",
fixturesDir() + "/sample_metadata.json",
err);
ASSERT_FALSE(r.hasError()) << r.error.toStdString();
// Metadata from JSON
EXPECT_EQ(r.module.name, "sample_module");
EXPECT_EQ(r.module.version, "1.2.3");
EXPECT_EQ(r.module.description, "A sample module for testing");
EXPECT_EQ(r.module.category, "testing");
ASSERT_EQ(r.module.depends.size(), 2);
EXPECT_EQ(r.module.depends[0], "dep_a");
// Methods — should find all public methods, skip ctor/dtor/private
EXPECT_GE(r.module.methods.size(), 10);
}
// A dependency entry may carry the constraints an installer resolves it by,
// and generation still needs the name. Read as a plain string, an object entry
// came back empty and the module it names vanished from the generated
// LogosModules aggregate, so every call through it failed to compile.
TEST_F(ImplHeaderParserTest, ReadsDependenciesDeclaredInObjectForm)
{
auto r = parseImplHeader(
fixturesDir() + "/sample_impl.h",
"SampleModuleImpl",
fixturesDir() + "/object_deps_metadata.json",
err);
ASSERT_FALSE(r.hasError()) << r.error.toStdString();
ASSERT_EQ(r.module.depends.size(), 3);
EXPECT_EQ(r.module.depends[0], "dep_a");
EXPECT_EQ(r.module.depends[1], "dep_b");
EXPECT_EQ(r.module.depends[2], "dep_c");
}
TEST_F(ImplHeaderParserTest, MethodTypes)
{
auto r = parseImplHeader(
fixturesDir() + "/sample_impl.h",
"SampleModuleImpl",
fixturesDir() + "/sample_metadata.json",
err);
ASSERT_FALSE(r.hasError()) << r.error.toStdString();
// Find specific methods and check their types
auto findMethod = [&](const std::string& name) -> const MethodDecl* {
for (const auto& m : r.module.methods)
if (m.name == name) return &m;
return nullptr;
};
// std::string greet(const std::string& name) → tstr
auto greet = findMethod("greet");
ASSERT_NE(greet, nullptr);
EXPECT_EQ(greet->returnType.name, "tstr");
ASSERT_EQ(greet->params.size(), 1);
EXPECT_EQ(greet->params[0].name, "name");
EXPECT_EQ(greet->params[0].type.name, "tstr");
// bool isValid(const std::string& input) → bool
auto isValid = findMethod("isValid");
ASSERT_NE(isValid, nullptr);
EXPECT_EQ(isValid->returnType.name, "bool");
// int64_t getCount() → int
auto getCount = findMethod("getCount");
ASSERT_NE(getCount, nullptr);
EXPECT_EQ(getCount->returnType.name, "int");
EXPECT_TRUE(getCount->params.empty());
// uint64_t getSize() → uint
auto getSize = findMethod("getSize");
ASSERT_NE(getSize, nullptr);
EXPECT_EQ(getSize->returnType.name, "uint");
// double getScore() → float64
auto getScore = findMethod("getScore");
ASSERT_NE(getScore, nullptr);
EXPECT_EQ(getScore->returnType.name, "float64");
// void doNothing() → void
auto doNothing = findMethod("doNothing");
ASSERT_NE(doNothing, nullptr);
EXPECT_EQ(doNothing->returnType.name, "void");
// std::vector<std::string> getNames() → [tstr]
auto getNames = findMethod("getNames");
ASSERT_NE(getNames, nullptr);
EXPECT_EQ(getNames->returnType.kind, TypeExpr::Array);
EXPECT_EQ(getNames->returnType.elements[0].name, "tstr");
// std::vector<uint8_t> getData() → bstr
auto getData = findMethod("getData");
ASSERT_NE(getData, nullptr);
EXPECT_EQ(getData->returnType.name, "bstr");
// std::vector<int64_t> getIds() → [int]
auto getIds = findMethod("getIds");
ASSERT_NE(getIds, nullptr);
EXPECT_EQ(getIds->returnType.kind, TypeExpr::Array);
EXPECT_EQ(getIds->returnType.elements[0].name, "int");
// std::string combine(const std::string& a, const std::string& b, int64_t count)
auto combine = findMethod("combine");
ASSERT_NE(combine, nullptr);
EXPECT_EQ(combine->returnType.name, "tstr");
ASSERT_EQ(combine->params.size(), 3);
EXPECT_EQ(combine->params[0].name, "a");
EXPECT_EQ(combine->params[1].name, "b");
EXPECT_EQ(combine->params[2].name, "count");
EXPECT_EQ(combine->params[2].type.name, "int");
}
TEST_F(ImplHeaderParserTest, SkipsPrivateMethods)
{
auto r = parseImplHeader(
fixturesDir() + "/sample_impl.h",
"SampleModuleImpl",
fixturesDir() + "/sample_metadata.json",
err);
ASSERT_FALSE(r.hasError()) << r.error.toStdString();
for (const auto& m : r.module.methods) {
EXPECT_NE(m.name, "internalHelper") << "Private method should not be parsed";
}
}
// ---------------------------------------------------------------------------
// Empty class
// ---------------------------------------------------------------------------
TEST_F(ImplHeaderParserTest, EmptyClass)
{
auto r = parseImplHeader(
fixturesDir() + "/empty_class_impl.h",
"EmptyClassImpl",
fixturesDir() + "/empty_metadata.json",
err);
ASSERT_FALSE(r.hasError()) << r.error.toStdString();
EXPECT_TRUE(r.module.methods.empty());
// Should have a warning in err output
EXPECT_TRUE(errOutput.contains("Warning"));
}
// ---------------------------------------------------------------------------
// Complex class with access specifier changes
// ---------------------------------------------------------------------------
TEST_F(ImplHeaderParserTest, ComplexAccessSpecifiers)
{
auto r = parseImplHeader(
fixturesDir() + "/complex_impl.h",
"ComplexModuleImpl",
fixturesDir() + "/empty_metadata.json",
err);
ASSERT_FALSE(r.hasError()) << r.error.toStdString();
auto findMethod = [&](const std::string& name) -> const MethodDecl* {
for (const auto& m : r.module.methods)
if (m.name == name) return &m;
return nullptr;
};
// First public section
EXPECT_NE(findMethod("firstMethod"), nullptr);
// Second public section (after protected)
EXPECT_NE(findMethod("secondMethod"), nullptr);
EXPECT_NE(findMethod("thirdMethod"), nullptr);
// Protected method should be skipped
EXPECT_EQ(findMethod("protectedHelper"), nullptr);
// Private method should be skipped
EXPECT_EQ(findMethod("privateHelper"), nullptr);
}
// ---------------------------------------------------------------------------
// Error cases
// ---------------------------------------------------------------------------
// A struct in an impl header becomes a contract `type` — but ONLY if the API
// mentions it. A header routinely declares private helpers, and publishing
// those would change the module's interface as a side effect of an internal
// refactor. Verified against two real modules: openmetrics' `ModuleSource` and
// the package manager's in-class `PendingAction` were both being published.
TEST_F(ImplHeaderParserTest, OnlyApiReferencedStructsBecomeRecords)
{
auto r = parseImplHeader(
fixturesDir() + "/records_impl.h",
"RecordsImpl",
fixturesDir() + "/records_metadata.json",
err);
ASSERT_FALSE(r.hasError()) << r.error.toStdString();
std::vector<std::string> names;
for (const auto& t : r.module.types) names.push_back(t.name);
std::sort(names.begin(), names.end());
// Blob is named directly; Wrapper too. Internal and Helper are not.
ASSERT_EQ(names.size(), 2u) << "published: " << [&]{
std::string j; for (const auto& n : names) j += n + " "; return j; }();
EXPECT_EQ(names[0], "Blob");
EXPECT_EQ(names[1], "Wrapper");
// A field with a trailing comment must NOT be silently dropped: a record
// published with a partial field list looks like a contract and is not one.
for (const auto& t : r.module.types) {
if (t.name != "Blob") continue;
ASSERT_EQ(t.fields.size(), 3u);
EXPECT_EQ(t.fields[2].name, "payload");
EXPECT_EQ(t.fields[2].type.name, "bstr");
}
}
// The closure is transitive: a record reaches the contract because something
// the API names refers to it, however indirectly.
TEST_F(ImplHeaderParserTest, RecordsReachableOnlyThroughAnotherRecordAreKept)
{
auto r = parseImplHeader(
fixturesDir() + "/records_impl.h",
"RecordsImpl",
fixturesDir() + "/records_metadata.json",
err);
ASSERT_FALSE(r.hasError()) << r.error.toStdString();
// Wrapper's own fields name Blob; both survive even though a signature
// could have named only one of them.
bool sawWrapper = false;
for (const auto& t : r.module.types) {
if (t.name != "Wrapper") continue;
sawWrapper = true;
ASSERT_EQ(t.fields.size(), 2u);
EXPECT_EQ(t.fields[0].type.name, "Blob");
EXPECT_EQ(t.fields[1].type.elements.at(0).name, "Blob");
}
EXPECT_TRUE(sawWrapper);
}
TEST_F(ImplHeaderParserTest, MissingHeaderFile)
{
auto r = parseImplHeader(
"/nonexistent/path.h",
"Foo",
fixturesDir() + "/sample_metadata.json",
err);
EXPECT_TRUE(r.hasError());
EXPECT_TRUE(r.error.contains("Failed to open header"));
}
TEST_F(ImplHeaderParserTest, MissingMetadataFile)
{
auto r = parseImplHeader(
fixturesDir() + "/sample_impl.h",
"SampleModuleImpl",
"/nonexistent/metadata.json",
err);
EXPECT_TRUE(r.hasError());
EXPECT_TRUE(r.error.contains("Failed to open metadata"));
}
TEST_F(ImplHeaderParserTest, WrongClassName)
{
auto r = parseImplHeader(
fixturesDir() + "/sample_impl.h",
"NonExistentClass",
fixturesDir() + "/sample_metadata.json",
err);
// Not an error per se, but should find zero methods and warn
ASSERT_FALSE(r.hasError());
EXPECT_TRUE(r.module.methods.empty());
EXPECT_TRUE(errOutput.contains("Warning"));
}
// ---------------------------------------------------------------------------
// LogosMap / LogosList, Qt collections, metadata events, emitEvent detection
// ---------------------------------------------------------------------------
TEST_F(ImplHeaderParserTest, UniversalTypesAndMetadataEvents)
{
auto r = parseImplHeader(
fixturesDir() + "/universal_impl.h",
"UniversalImpl",
fixturesDir() + "/universal_metadata.json",
err);
ASSERT_FALSE(r.hasError()) << r.error.toStdString();
EXPECT_EQ(r.module.name, "universal_mod");
EXPECT_EQ(r.module.version, "2.0.0");
ASSERT_EQ(r.module.events.size(), 1);
EXPECT_EQ(r.module.events[0].name, "onReady");
// Optional per-event description carried from metadata.json events[].
EXPECT_EQ(r.module.events[0].description, "Fired once the module is ready.");
ASSERT_EQ(r.module.events[0].params.size(), 1);
EXPECT_EQ(r.module.events[0].params[0].name, "info");
EXPECT_EQ(r.module.events[0].params[0].type.name, "tstr");
auto findMethod = [&](const std::string& name) -> const MethodDecl* {
for (const auto& m : r.module.methods)
if (m.name == name) return &m;
return nullptr;
};
// The fixture declares a `std::function<…> emitEvent` member. The old
// legacy hook treated it specially; now such members are simply skipped
// and never mistaken for a callable method.
EXPECT_EQ(findMethod("emitEvent"), nullptr);
auto fetchMap = findMethod("fetchMap");
ASSERT_NE(fetchMap, nullptr);
EXPECT_EQ(fetchMap->returnType.kind, TypeExpr::Map);
EXPECT_TRUE(fetchMap->jsonReturn);
auto fetchList = findMethod("fetchList");
ASSERT_NE(fetchList, nullptr);
EXPECT_EQ(fetchList->returnType.kind, TypeExpr::Array);
EXPECT_EQ(fetchList->returnType.elements[0].name, "any");
EXPECT_TRUE(fetchList->jsonReturn);
auto asVariantMap = findMethod("asVariantMap");
ASSERT_NE(asVariantMap, nullptr);
EXPECT_EQ(asVariantMap->returnType.kind, TypeExpr::Map);
EXPECT_FALSE(asVariantMap->jsonReturn);
auto listNames = findMethod("listNames");
ASSERT_NE(listNames, nullptr);
EXPECT_EQ(listNames->returnType.kind, TypeExpr::Array);
EXPECT_EQ(listNames->returnType.elements[0].name, "tstr");
EXPECT_FALSE(listNames->jsonReturn);
auto anyList = findMethod("anyList");
ASSERT_NE(anyList, nullptr);
EXPECT_EQ(anyList->returnType.kind, TypeExpr::Array);
EXPECT_EQ(anyList->returnType.elements[0].name, "any");
EXPECT_FALSE(anyList->jsonReturn);
auto fetchResult = findMethod("fetchResult");
ASSERT_NE(fetchResult, nullptr);
EXPECT_EQ(fetchResult->returnType.kind, TypeExpr::Primitive);
EXPECT_EQ(fetchResult->returnType.name, "result");
EXPECT_FALSE(fetchResult->jsonReturn);
EXPECT_TRUE(fetchResult->resultReturn);
auto fetchResultNodiscard = findMethod("fetchResultNodiscard");
ASSERT_NE(fetchResultNodiscard, nullptr);
EXPECT_EQ(fetchResultNodiscard->returnType.name, "result");
EXPECT_TRUE(fetchResultNodiscard->resultReturn);
auto fetchResultStatic = findMethod("fetchResultStatic");
ASSERT_NE(fetchResultStatic, nullptr);
EXPECT_EQ(fetchResultStatic->returnType.name, "result");
EXPECT_TRUE(fetchResultStatic->resultReturn);
auto fetchResultNodiscardStatic = findMethod("fetchResultNodiscardStatic");
ASSERT_NE(fetchResultNodiscardStatic, nullptr);
EXPECT_EQ(fetchResultNodiscardStatic->returnType.name, "result");
EXPECT_TRUE(fetchResultNodiscardStatic->resultReturn);
auto fetchResultStaticNodiscard = findMethod("fetchResultStaticNodiscard");
ASSERT_NE(fetchResultStaticNodiscard, nullptr);
EXPECT_EQ(fetchResultStaticNodiscard->returnType.name, "result");
EXPECT_TRUE(fetchResultStaticNodiscard->resultReturn);
auto fetchResultMultiAttr = findMethod("fetchResultMultiAttr");
ASSERT_NE(fetchResultMultiAttr, nullptr);
EXPECT_EQ(fetchResultMultiAttr->returnType.name, "result");
EXPECT_TRUE(fetchResultMultiAttr->resultReturn);
auto fetchResultInlineStatic = findMethod("fetchResultInlineStatic");
ASSERT_NE(fetchResultInlineStatic, nullptr);
EXPECT_EQ(fetchResultInlineStatic->returnType.name, "result");
EXPECT_TRUE(fetchResultInlineStatic->resultReturn);
auto fetchResultConsteval = findMethod("fetchResultConsteval");
ASSERT_NE(fetchResultConsteval, nullptr);
EXPECT_EQ(fetchResultConsteval->returnType.name, "result");
EXPECT_TRUE(fetchResultConsteval->resultReturn);
for (const auto& m : r.module.methods) {
EXPECT_NE(m.name, "void") << "Keyword should not appear as method name";
}
}
// ---------------------------------------------------------------------------
// Event doc comments: `///` above a `logos_events:` declaration becomes the
// event's description (same capture rules as methods: doc-comments only,
// adjacent-only, multi-line joined with \n).
// ---------------------------------------------------------------------------
TEST_F(ImplHeaderParserTest, EventDocCommentsFromHeader)
{
auto r = parseImplHeader(
fixturesDir() + "/documented_events_impl.h",
"DocumentedEventsImpl",
fixturesDir() + "/documented_events_metadata.json",
err);
ASSERT_FALSE(r.hasError()) << r.error.toStdString();
ASSERT_EQ(r.module.events.size(), 3);
// Multi-line `///` doc comment: the two lines are joined with a newline.
EXPECT_EQ(r.module.events[0].name, "userLoggedIn");
EXPECT_EQ(r.module.events[0].description,
"Fired once the user has authenticated.\n"
"Carries the freshly issued session token.");
ASSERT_EQ(r.module.events[0].params.size(), 2);
EXPECT_EQ(r.module.events[0].params[0].name, "userId");
EXPECT_EQ(r.module.events[0].params[1].name, "token");
// A plain `//` comment is not a doc comment → no description captured.
EXPECT_EQ(r.module.events[1].name, "heartbeat");
EXPECT_TRUE(r.module.events[1].description.empty());
// Single-line `///` doc comment.
EXPECT_EQ(r.module.events[2].name, "shutdown");
EXPECT_EQ(r.module.events[2].description, "Single-line documented event.");
}
// ---------------------------------------------------------------------------
// Issue #76: a section specifier and a declaration on the *same* physical
// line (`logos_events : void foo();`, as clang-format / prettier produce)
// must be parsed identically to the newline-separated form. The code after
// the colon must not be discarded.
// ---------------------------------------------------------------------------
TEST_F(ImplHeaderParserTest, SameLineSectionSpecifiers)
{
auto r = parseImplHeader(
fixturesDir() + "/same_line_events_impl.h",
"SameLineEventsImpl",
fixturesDir() + "/same_line_events_metadata.json",
err);
ASSERT_FALSE(r.hasError()) << r.error.toStdString();
auto findEvent = [&](const std::string& name) -> const EventDecl* {
for (const auto& e : r.module.events)
if (e.name == name) return &e;
return nullptr;
};
auto findMethod = [&](const std::string& name) -> const MethodDecl* {
for (const auto& m : r.module.methods)
if (m.name == name) return &m;
return nullptr;
};
// The exact prettier form from the issue:
// logos_events : void versionReady(const std::string &version);
// Previously the prototype after the colon was discarded entirely.
const EventDecl* versionReady = findEvent("versionReady");
ASSERT_NE(versionReady, nullptr)
<< "Same-line `logos_events :` prototype must still be parsed";
ASSERT_EQ(versionReady->params.size(), 1);
EXPECT_EQ(versionReady->params[0].name, "version");
EXPECT_EQ(versionReady->params[0].type.name, "tstr");
// The `///` doc comment above the collapsed line must attach: in the
// same-line form there is nowhere else for it to go, so documentation
// must not be formatting-dependent either.
EXPECT_EQ(versionReady->description, "Fired once the latest version is known.");
// An event declared after the section is already open, also same-line.
const EventDecl* downloadProgress = findEvent("downloadProgress");
ASSERT_NE(downloadProgress, nullptr);
ASSERT_EQ(downloadProgress->params.size(), 2);
EXPECT_EQ(downloadProgress->params[0].name, "id");
EXPECT_EQ(downloadProgress->params[0].type.name, "tstr");
EXPECT_EQ(downloadProgress->params[1].name, "percent");
EXPECT_EQ(downloadProgress->params[1].type.name, "int");
// The newline-separated form keeps working alongside the collapsed form.
EXPECT_NE(findEvent("shutdown"), nullptr);
// Exactly the three events above — no phantom or dropped entries.
EXPECT_EQ(r.module.events.size(), 3);
// The symmetric case: `public : <decl>` on one line must surface the
// method too (the access specifier no longer swallows the declaration).
const MethodDecl* greet = findMethod("greet");
ASSERT_NE(greet, nullptr)
<< "Same-line `public:` declaration must still be parsed";
EXPECT_EQ(greet->returnType.name, "tstr");
ASSERT_EQ(greet->params.size(), 1);
EXPECT_EQ(greet->params[0].name, "name");
EXPECT_EQ(greet->params[0].type.name, "tstr");
// The same-line events must land in events[], never leak into methods[].
EXPECT_EQ(findMethod("versionReady"), nullptr);
EXPECT_EQ(findMethod("downloadProgress"), nullptr);
}
TEST_F(ImplHeaderParserTest, ParsesMultiLineSignature)
{
QTemporaryDir dir;
ASSERT_TRUE(dir.isValid());
const QString hp = dir.filePath("ml_impl.h");
{
QFile f(hp);
ASSERT_TRUE(f.open(QIODevice::WriteOnly | QIODevice::Text));
f.write(
"#pragma once\n"
"#include <string>\n"
"class MlImpl {\n"
"public:\n"
" std::string single(const std::string& a);\n"
" std::string wrapped(const std::string& first,\n"
" const std::string& second);\n"
"};\n");
}
auto r = parseImplHeader(hp, "MlImpl",
fixturesDir() + "/sample_metadata.json", err);
ASSERT_FALSE(r.hasError()) << r.error.toStdString();
QStringList names;
for (const auto& m : r.module.methods) names << QString::fromStdString(m.name);
EXPECT_TRUE(names.contains("single"));
EXPECT_TRUE(names.contains("wrapped"))
<< "got: " << names.join(",").toStdString();
}
// ---------------------------------------------------------------------------
// Optionality, header-first
//
// `std::optional<T>` used to fall through to the opaque `any` fallback with no
// diagnostic, so a header-first C++ provider could not express an optional at
// all: it declared one and published a contract that said something else.
// ---------------------------------------------------------------------------
TEST_F(ImplHeaderParserTest, StdOptionalBecomesOptional)
{
auto r = parseImplHeader(
fixturesDir() + "/optional_impl.h",
"OptionalImpl",
fixturesDir() + "/optional_metadata.json",
err);
ASSERT_FALSE(r.hasError()) << r.error.toStdString();
auto findType = [&](const char* n) -> const TypeDecl* {
for (const auto& t : r.module.types)
if (t.name == n) return &t;
return nullptr;
};
auto findMethod = [&](const char* n) -> const MethodDecl* {
for (const auto& m : r.module.methods)
if (m.name == n) return &m;
return nullptr;
};
const TypeDecl* profile = findType("Profile");
ASSERT_NE(profile, nullptr);
auto fieldNamed = [&](const char* n) -> const FieldDecl* {
for (const auto& f : profile->fields)
if (f.name == n) return &f;
return nullptr;
};
// A plain member stays required.
ASSERT_NE(fieldNamed("required"), nullptr);
EXPECT_FALSE(fieldIsOptional(*fieldNamed("required")));
// Optional members carry the value type, not `any`.
ASSERT_NE(fieldNamed("nickname"), nullptr);
EXPECT_TRUE(fieldIsOptional(*fieldNamed("nickname")));
EXPECT_EQ(fieldValueType(*fieldNamed("nickname")).name, "tstr");
EXPECT_EQ(fieldValueType(*fieldNamed("age")).name, "uint");
EXPECT_EQ(fieldValueType(*fieldNamed("avatar")).name, "bstr");
// Optional composes with a declared record — and `std::optional<Blob>` is
// still a MENTION of Blob, so the record survives the
// keep-only-referenced-records pass instead of being dropped as unused.
ASSERT_NE(fieldNamed("blob"), nullptr);
EXPECT_EQ(fieldValueType(*fieldNamed("blob")).kind, TypeExpr::Named);
EXPECT_EQ(fieldValueType(*fieldNamed("blob")).name, "Blob");
EXPECT_NE(findType("Blob"), nullptr);
// Parameters and returns, and optional nested inside a container.
const MethodDecl* echo = findMethod("echoOptional");
ASSERT_NE(echo, nullptr);
ASSERT_EQ(echo->params.size(), 1u);
EXPECT_TRUE(paramIsOptional(echo->params[0]));
EXPECT_EQ(paramValueType(echo->params[0]).name, "tstr");
EXPECT_TRUE(typeIsOptional(echo->returnType));
const MethodDecl* lst = findMethod("echoOptionalList");
ASSERT_NE(lst, nullptr);
ASSERT_EQ(lst->params.size(), 1u);
EXPECT_EQ(lst->params[0].type.kind, TypeExpr::Array);
ASSERT_EQ(lst->params[0].type.elements.size(), 1u);
EXPECT_EQ(lst->params[0].type.elements[0].kind, TypeExpr::Optional);
// A required method is untouched.
const MethodDecl* req = findMethod("required");
ASSERT_NE(req, nullptr);
EXPECT_FALSE(paramIsOptional(req->params[0]));
EXPECT_FALSE(typeIsOptional(req->returnType));
// The event parameter, likewise.
ASSERT_EQ(r.module.events.size(), 1u);
ASSERT_EQ(r.module.events[0].params.size(), 2u);
EXPECT_FALSE(paramIsOptional(r.module.events[0].params[0]));
EXPECT_TRUE(paramIsOptional(r.module.events[0].params[1]));
}
// std::optional<std::optional<T>> has NO LIDL type: three C++ states over a
// two-state wire. It maps down to `?T` — which is what makes the author's own
// declaration stop compiling against the generated codec, deliberately — and
// says so here, rather than leaving a conversion error in generated code.
TEST_F(ImplHeaderParserTest, NestedOptionalCollapsesAndIsReported)
{
QTemporaryDir dir;
ASSERT_TRUE(dir.isValid());
const QString hp = dir.filePath("nested_impl.h");
{
QFile f(hp);
ASSERT_TRUE(f.open(QIODevice::WriteOnly | QIODevice::Text));
f.write(
"#pragma once\n"
"#include <optional>\n"
"#include <string>\n"
"struct Rec {\n"
" std::optional<std::optional<std::string>> collapsed;\n"
"};\n"
"class NestedImpl {\n"
"public:\n"
" Rec echo(const Rec& v);\n"
"};\n");
}
auto r = parseImplHeader(hp, "NestedImpl",
fixturesDir() + "/sample_metadata.json", err);
ASSERT_FALSE(r.hasError()) << r.error.toStdString();
ASSERT_EQ(r.module.types.size(), 1u);
ASSERT_EQ(r.module.types[0].fields.size(), 1u);
const FieldDecl& f = r.module.types[0].fields[0];
EXPECT_TRUE(fieldIsOptional(f));
// Collapsed to ONE layer — the contract may not carry a third state.
EXPECT_EQ(fieldValueType(f).kind, TypeExpr::Primitive);
EXPECT_EQ(fieldValueType(f).name, "tstr");
err.flush();
EXPECT_TRUE(errOutput.contains("std::optional<std::optional<std::string>>"))
<< errOutput.toStdString();
EXPECT_TRUE(errOutput.contains("no LIDL type")) << errOutput.toStdString();
}