mirror of
https://github.com/logos-co/logos-cpp-sdk.git
synced 2026-08-29 16:51:08 +00:00
Dario LipicarandClaude Opus 5
461cfed52d
* refactor: the LIDL codec exists once
The cdylib generator emitted its own copy of the codec — ~186 lines of
C++-emitting-C++ mirroring logos-protocol's logos_codec.h by hand. Every codec
fix had to be written twice or it silently only half-applied, which happened
twice in a row recently (routing scalars through the codec + signedness; then
accepting 3.0 while still rejecting 3.7).
It was worse than duplication. The two copies had DRIFTED — the emitted integer
decode gated on is_number() where the canonical one checked is_number_integer()
|| is_number_unsigned() — and logos_json.h's byte helpers were the same mangled
symbols with weak linkage and DIFFERENT bodies as logos_codec.h's, both reaching
one program (module TUs compiled one; liblogos_protocol.a carries TUs that
included the other). Which body won was down to link order.
logos_json.h goes back to its documented charter — "LogosMap/LogosList aliases
for impl classes", per its own CMakeLists — and loses 77 lines. jsonToBytes moves
beside its sibling jsonToStringVec in logos_lp_client.h, rebuilt on the canonical
isTaggedBytes/b64UrlDecode; it keeps its own narrow spelling because every lp
decoder is documented to yield the default-constructed value on a mismatch,
which neither bytesFromJson (throws) nor bytesFromJsonLenient (accepts more) does.
Emptying it rather than making it include logos_codec.h is deliberate: some
thirty alias-only include sites across the module repos get ZERO new includes,
and logos-cpp-sdkConfig's "only dependency is nlohmann_json" stays true.
With the clash gone the generic half is deletable. emitGeneratedCodec becomes
emitRecordCodecs: one logos::detail::Codec<::Rec, void> per declared record, and
nothing else. That residue is irreducible — a LIDL `type` is a per-contract
struct whose fields exist only in that module's header, and C++17 has no field
reflection. Nesting composes for free: Codec<std::vector<Blob>> and deeper come
from the shared half once Codec<::Blob> exists.
One asymmetry dies with it. The scalar bstr decode and the [bstr] element decode
were different functions with different strictness, so echoBytes("hi") succeeded
while echoBytesList(["hi"]) threw — inside one module, for the same type. They
are one function now.
Build wiring: ONE line, in this repo's own test CMake, using a variable
nix/tests.nix already supplies. Nothing in logos-module-builder, logos-qt-sdk, or
any module repo.
verified: cpp-sdk + protocol suites green; test_fullapi_cpp, test_fullapi_ext_cpp
and test_basic_module_cpp build; test-modules 176/176. Conformance delta is
exactly one cell, baselined first in logos-test-modules#31.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* chore: bump logos-protocol to the path-threaded bstr decoder
logos-protocol 4359557 (#33). Required by this branch, not incidental: deleting
the emitted codec swaps its path-carrying bstr decode for the canonical one, and
without #33 the canonical one reported "at value" instead of "[0].payload" —
losing the diagnostic exactly where a malformed bstr is hardest to find.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
31 lines
1.6 KiB
C
31 lines
1.6 KiB
C
#pragma once
|
|
#include <nlohmann/json.hpp>
|
|
|
|
// Semantic aliases for nlohmann::json used in universal module impl classes.
|
|
// The code generator recognizes these names and emits QVariantMap / QVariantList
|
|
// conversions in the Qt glue layer, so impl classes remain Qt-free.
|
|
//
|
|
// ALIASES ONLY, on purpose. This header also used to define b64UrlEncode,
|
|
// b64UrlDecode, bytesToJson and jsonToBytes — second copies of functions
|
|
// logos-protocol's logos_codec.h already owned. That was not merely duplication:
|
|
// the two sets had the same mangled names with weak linkage and DIFFERENT bodies,
|
|
// and both reached one program, because module TUs compiled these while
|
|
// liblogos_protocol.a carries TUs that included logos_codec.h. Which body won was
|
|
// down to link order.
|
|
//
|
|
// It also made logos_codec.h unincludable from any TU that wanted LogosMap — a
|
|
// redefinition error, since `inline` allows one definition per translation unit,
|
|
// not two. That is why the cdylib generator had to emit its own copy of the
|
|
// entire codec, and why every codec fix had to be written twice.
|
|
//
|
|
// The byte helpers now live where they belong: the canonical ones in
|
|
// logos-protocol's logos_codec.h, and the lenient `lp`-path jsonToBytes beside
|
|
// its sibling jsonToStringVec in logos_lp_client.h.
|
|
//
|
|
// Keeping this header dependency-free (nlohmann only) is deliberate. Some thirty
|
|
// alias-only include sites across the module repos would otherwise inherit an
|
|
// include path they have no use for, and logos-cpp-sdkConfig.cmake's "its only
|
|
// dependency is nlohmann_json" would stop being true.
|
|
using LogosMap = nlohmann::json;
|
|
using LogosList = nlohmann::json;
|