Files
logos-protocol/cpp/logos_json_convert.cpp
T
Dario LipicarandClaude Opus 4.8 4775e635ff fix(json-convert): preserve integer types inside QVariant containers (#21)
* fix(json-convert): preserve integer types inside containers

qvariantToNlohmann() kept integer QVariant types only for a top-level scalar;
a QVariantList/QVariantMap fell through to QJsonValue::fromVariant, which
degrades every numeric to double at every depth. So a `[int]`/`[uint]`/
`[float64]`/`[bool]` method arg (a QVariantList of ints) arrived as a float
array, and the generated cdylib dispatch's strict .get<std::vector<int64_t>>()
threw -> the param decoded as an EMPTY vector. Surfaced by a UI plugin driving
[int] method args over QtRO.

Recurse into QVariantList/QStringList/QVariantMap element-by-element so nested
integers keep their type (and bytes/maps/lists keep their shape); also route the
LogosResult value through the same recursion. Adds JsonConvertInts tests.

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

* test: pin LongLong container test with values > 2^53

Copilot review: (10, 20) survive an accidental IEEE-754 double detour, so they
did not actually pin the integer-preservation regression. Use 2^53+1 and
INT64_MAX, which lose precision / serialize in scientific notation if degraded.

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

---------

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
2026-07-17 16:22:06 -03:00

207 lines
7.6 KiB
C++

#include "logos_json_convert.h"
#include "logos_types.h"
#include <QJsonDocument>
#include <QJsonObject>
#include <QJsonArray>
#include <QJsonValue>
#include <QMetaType>
namespace logos {
namespace {
// Canonical C-ABI bytes encoding: {"_bytes": "<base64url, unpadded>"} — a
// single-key object, lossless for arbitrary bytes incl. embedded NUL.
// Matches the plain wire's encoding (implementations/plain/json_mapping.cpp);
// Qt's Base64UrlEncoding|OmitTrailingEquals produces the identical alphabet
// and padding-free form.
nlohmann::json byteArrayToTaggedJson(const QByteArray& bytes)
{
nlohmann::json obj;
obj["_bytes"] = bytes.toBase64(QByteArray::Base64UrlEncoding
| QByteArray::OmitTrailingEquals)
.toStdString();
return obj;
}
bool isTaggedBytes(const nlohmann::json& j)
{
return j.is_object() && j.size() == 1 && j.contains("_bytes")
&& j["_bytes"].is_string();
}
QByteArray taggedJsonToByteArray(const nlohmann::json& j)
{
return QByteArray::fromBase64(
QByteArray::fromStdString(j["_bytes"].get<std::string>()),
QByteArray::Base64UrlEncoding);
}
} // namespace
nlohmann::json qvariantToNlohmann(const QVariant& v)
{
if (v.userType() == QMetaType::QByteArray)
return byteArrayToTaggedJson(v.toByteArray());
const int logosResultId = QMetaType::fromName("LogosResult").id();
if (logosResultId != QMetaType::UnknownType && v.userType() == logosResultId) {
const LogosResult lr = v.value<LogosResult>();
nlohmann::json obj;
obj["success"] = lr.success;
// Recurse so the result value keeps its exact shape: bytes -> tagged
// form, nested integers stay integers, maps/lists preserved (the old
// QJsonValue::fromVariant path degraded numerics to double and mangled
// bytes).
obj["value"] = qvariantToNlohmann(lr.value);
QJsonValue errJson = QJsonValue::fromVariant(lr.error);
obj["error"] = errJson.isString() ? nlohmann::json(errJson.toString().toStdString())
: nullptr;
return obj;
}
if (v.canConvert<QJsonObject>()) {
QJsonDocument doc(v.toJsonObject());
try { return nlohmann::json::parse(doc.toJson(QJsonDocument::Compact).toStdString()); }
catch (...) {}
}
if (v.canConvert<QJsonArray>()) {
QJsonDocument doc(qvariant_cast<QJsonArray>(v));
try { return nlohmann::json::parse(doc.toJson(QJsonDocument::Compact).toStdString()); }
catch (...) {}
}
// Integers stay integers: QJsonValue::fromVariant degrades every numeric
// to double, which a strict consumer on the other side of the C ABI
// (e.g. a generated dispatch reading an int param) must not see as 5.0.
switch (v.userType()) {
case QMetaType::Int: return v.toInt();
case QMetaType::UInt: return v.toUInt();
case QMetaType::LongLong: return static_cast<int64_t>(v.toLongLong());
case QMetaType::ULongLong: return static_cast<uint64_t>(v.toULongLong());
default: break;
}
// Containers: recurse element-by-element so NESTED integers keep their type
// too. The QJsonValue::fromVariant fallback below degrades every numeric to
// double at every depth, so a `[int]` param (a QVariantList of ints) would
// arrive as [1.0, 2.0, ...] and a strict `.get<std::vector<int64_t>>()` on
// the C-ABI side throws -> the dispatch decodes an empty vector. The scalar
// switch above only covers a top-level number; these cover the list/map/
// string-list wrappers that carry them.
if (v.userType() == QMetaType::QStringList) {
nlohmann::json arr = nlohmann::json::array();
for (const QString& s : v.toStringList())
arr.push_back(s.toStdString());
return arr;
}
if (v.userType() == QMetaType::QVariantList) {
nlohmann::json arr = nlohmann::json::array();
for (const QVariant& e : v.toList())
arr.push_back(qvariantToNlohmann(e));
return arr;
}
if (v.userType() == QMetaType::QVariantMap) {
nlohmann::json obj = nlohmann::json::object();
const QVariantMap m = v.toMap();
for (auto it = m.constBegin(); it != m.constEnd(); ++it)
obj[it.key().toStdString()] = qvariantToNlohmann(it.value());
return obj;
}
QJsonValue jv = QJsonValue::fromVariant(v);
if (jv.isString()) return jv.toString().toStdString();
if (jv.isBool()) return jv.toBool();
if (jv.isDouble()) return jv.toDouble();
if (jv.isObject() || jv.isArray()) {
QJsonDocument doc = jv.isObject() ? QJsonDocument(jv.toObject())
: QJsonDocument(jv.toArray());
try { return nlohmann::json::parse(doc.toJson(QJsonDocument::Compact).toStdString()); }
catch (...) {}
}
return nullptr;
}
QVariant nlohmannToQVariant(const nlohmann::json& j)
{
if (j.is_null())
return QVariant();
if (j.is_boolean())
return QVariant(j.get<bool>());
if (j.is_number_unsigned())
return QVariant(static_cast<qulonglong>(j.get<uint64_t>()));
if (j.is_number_integer())
return QVariant(static_cast<qlonglong>(j.get<int64_t>()));
if (j.is_number_float())
return QVariant(j.get<double>());
if (j.is_string())
return QVariant(QString::fromStdString(j.get<std::string>()));
if (isTaggedBytes(j))
return QVariant(taggedJsonToByteArray(j));
if (j.is_object()) {
QVariantMap map;
for (auto it = j.begin(); it != j.end(); ++it)
map.insert(QString::fromStdString(it.key()), nlohmannToQVariant(it.value()));
return QVariant(map);
}
if (j.is_array()) {
QVariantList list;
list.reserve(static_cast<int>(j.size()));
for (const auto& elem : j)
list.append(nlohmannToQVariant(elem));
return QVariant(list);
}
return QVariant();
}
QVariantList nlohmannArgsToQVariantList(const nlohmann::json& args)
{
QVariantList result;
if (!args.is_array()) return result;
for (const auto& arg : args) {
if (arg.is_string())
result.append(QString::fromStdString(arg.get<std::string>()));
else if (arg.is_boolean())
result.append(arg.get<bool>());
else if (arg.is_number_unsigned())
result.append(static_cast<qulonglong>(arg.get<uint64_t>()));
else if (arg.is_number_integer())
result.append(static_cast<qlonglong>(arg.get<int64_t>()));
else if (arg.is_number_float())
result.append(arg.get<double>());
else if (arg.is_null())
result.append(QVariant());
else if (isTaggedBytes(arg))
result.append(QVariant(taggedJsonToByteArray(arg)));
else if (arg.is_object() || arg.is_array()) {
result.append(nlohmannToQVariant(arg));
} else {
result.append(QVariant());
}
}
return result;
}
QJsonArray methodsToJsonArray(const std::vector<LogosMethodMetadata>& methods)
{
QJsonArray out;
for (const auto& m : methods) {
QJsonObject o;
o["name"] = QString::fromStdString(m.name);
o["signature"] = QString::fromStdString(m.signature);
o["returnType"] = QString::fromStdString(m.returnType);
o["isInvokable"] = m.isInvokable;
if (m.parameters.is_array()) {
QJsonDocument paramDoc = QJsonDocument::fromJson(
QByteArray::fromStdString(m.parameters.dump()));
o["parameters"] = paramDoc.array();
} else {
o["parameters"] = QJsonArray();
}
out.append(o);
}
return out;
}
} // namespace logos