mirror of
https://github.com/logos-co/logos-cpp-sdk.git
synced 2026-08-31 17:51:07 +00:00
* Add per-event documentation + getPluginEvents introspection Mirror the per-method documentation pipeline for events. Events (declared in a universal module's logos_events: section) now carry a description parsed from their /// doc comments, and are introspectable at runtime via a new getPluginEvents framework call. - lidl_ast: EventDecl gains a description field. - impl_header_parser: capture the event's doc comment (previously discarded) and an optional metadata.json events[].description. - lidl_gen_provider: generated universal provider emits getEvents() override, mirroring getMethods() (name/signature/ parameters/description; no returnType/isInvokable — events are void). - logos_provider_object: default-empty virtual getEvents() so the legacy provider path and QtProviderObject inherit empty. - module_proxy / qt_provider_object: intercept getPluginEvents next to the getPluginMethods special-case. - docs: spec + README event-documentation notes. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * Add unit tests for event documentation + getEvents generation Address review feedback (#71): cover the event-introspection paths that previously only had method-side tests. - impl_header_parser test: assert metadata.json events[].description is parsed; new documented_events fixture asserts `///` doc-comment capture on a logos_events: block (multi-line joined with \n, adjacent-only, plain // ignored). - lidl_gen_provider test: assert the generated dispatch contains getEvents() emitting each event's name/signature/parameters and an escaped description, and that events carry no returnType/isInvokable. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * Fold event introspection into getMethods() to keep the provider ABI stable The previous approach added a getEvents() virtual to LogosProviderObject, which inserted a new vtable slot and shifted every later slot — an ABI break that would misdispatch virtual calls whenever an old and new host/module were mixed across the in-process plugin boundary. Instead, report events INSIDE the existing getMethods() call: it now returns the module's whole interface, with each entry tagged type "method" or "event" (events omit returnType/isInvokable). The provider vtable is therefore byte-for-byte unchanged, so old/new hosts and modules stay binary-compatible — a new host reading an old module sees no event entries (zero events), and an old host reading a new module just ignores the "type" field (cosmetic). An entry with no "type" is treated as a method. - logos_provider_object.h: remove the getEvents() virtual; document that getMethods() carries both, and why. - generator (lidl_gen_provider): emit events as type "event" entries inside getMethods(); tag methods type "method"; no getEvents() output. - module_proxy / qt_provider_object: getPluginMethods()/getPluginEvents() are now type-filtered views of getMethods(), plus a new getPluginInterface() returning the whole list. (These are name- dispatched Q_INVOKABLEs, not vtable surface — adding them is safe.) - tests: generator asserts events fold into getMethods() tagged "event"; ModuleProxy asserts the three filtered views; parser tests unchanged. - docs: spec/project/docs/README updated, incl. an ABI rationale note. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
132 lines
6.0 KiB
C++
132 lines
6.0 KiB
C++
#ifndef LOGOS_PROVIDER_OBJECT_H
|
|
#define LOGOS_PROVIDER_OBJECT_H
|
|
|
|
#include <QString>
|
|
#include <QVariant>
|
|
#include <QVariantList>
|
|
#include <QJsonArray>
|
|
#include <nlohmann/json.hpp>
|
|
#include <functional>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "logos_json_convert.h"
|
|
|
|
class LogosAPI;
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// LogosProviderObject — abstract provider-side interface (framework internal)
|
|
//
|
|
// This is the provider-side counterpart of LogosObject (consumer side).
|
|
// ModuleProxy wraps a LogosProviderObject* and publishes it via the transport.
|
|
// Module authors do NOT implement this directly — they inherit LogosProviderBase.
|
|
//
|
|
// Two parallel virtual interfaces:
|
|
// Qt interface: callMethod / getMethods / setEventListener (pure virtual)
|
|
// Universal interface: callMethodStd / getMethodsStd / setEventListenerStd (defaulted)
|
|
//
|
|
// Providers override ONE set. Those going Qt-free override the Std versions
|
|
// and delegate the Qt ones via the provided callMethodStdBridge / getMethodsStdBridge
|
|
// helpers (one-line overrides).
|
|
// ---------------------------------------------------------------------------
|
|
class LogosProviderObject {
|
|
public:
|
|
virtual ~LogosProviderObject() = default;
|
|
|
|
using EventCallback = std::function<void(const QString&, const QVariantList&)>;
|
|
using UniversalEventCallback = std::function<void(const std::string&, const std::string&)>;
|
|
|
|
// --- Qt interface (pure virtual — existing providers override these) ---
|
|
virtual QVariant callMethod(const QString& methodName, const QVariantList& args) = 0;
|
|
virtual bool informModuleToken(const QString& moduleName, const QString& token) = 0;
|
|
// Returns the module's full interface as a QJsonArray: both methods and
|
|
// events, each entry tagged with a "type" of "method" or "event" (events
|
|
// omit returnType/isInvokable — they are void/fire-and-forget). Events ride
|
|
// inside getMethods() ON PURPOSE: this avoids adding a separate getEvents()
|
|
// vtable slot, so the vtable layout never shifts and old/new hosts and
|
|
// modules stay binary-compatible. An entry with no "type" is a method (so
|
|
// pre-events modules degrade cleanly). Callers split the list by "type"
|
|
// (see ModuleProxy::getPluginMethods/getPluginEvents/getPluginInterface).
|
|
virtual QJsonArray getMethods() = 0;
|
|
virtual void setEventListener(EventCallback callback) = 0;
|
|
virtual void init(void* apiInstance) = 0;
|
|
virtual QString providerName() const = 0;
|
|
virtual QString providerVersion() const = 0;
|
|
|
|
// --- Universal interface (override these to stay Qt-free) ---
|
|
virtual nlohmann::json callMethodStd(const std::string& methodName, const nlohmann::json& args);
|
|
virtual std::vector<LogosMethodMetadata> getMethodsStd();
|
|
virtual void setEventListenerStd(UniversalEventCallback callback);
|
|
|
|
protected:
|
|
// Bridging helpers for Qt-free providers: override callMethod/getMethods
|
|
// with a one-liner delegating to these.
|
|
QVariant callMethodStdBridge(const QString& methodName, const QVariantList& args);
|
|
QJsonArray getMethodsStdBridge();
|
|
void setEventListenerStdBridge(EventCallback callback);
|
|
};
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// LogosProviderBase — convenience base class for new-API modules
|
|
//
|
|
// Handles framework plumbing so the developer only writes business logic.
|
|
// callMethod() and getMethods() are provided by generated code produced
|
|
// by logos-cpp-generator --provider-header (analogous to Qt MOC).
|
|
// ---------------------------------------------------------------------------
|
|
class LogosProviderBase : public LogosProviderObject {
|
|
public:
|
|
// These two are implemented by generated code (logos_provider_dispatch.cpp):
|
|
// QVariant callMethod(const QString& methodName, const QVariantList& args) override;
|
|
// QJsonArray getMethods() override;
|
|
|
|
void setEventListener(EventCallback callback) override { m_eventCallback = callback; }
|
|
bool informModuleToken(const QString& moduleName, const QString& token) override;
|
|
void init(void* apiInstance) override;
|
|
|
|
protected:
|
|
void emitEvent(const QString& eventName, const QVariantList& data);
|
|
virtual void onInit(LogosAPI* api) {}
|
|
LogosAPI* logosAPI() const { return m_logosAPI; }
|
|
|
|
private:
|
|
EventCallback m_eventCallback;
|
|
LogosAPI* m_logosAPI = nullptr;
|
|
};
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// LogosProviderPlugin — Qt interface for plugin loading
|
|
//
|
|
// New-API plugins implement this so the runtime can detect them via
|
|
// qobject_cast<LogosProviderPlugin*>() and use createProviderObject().
|
|
// ---------------------------------------------------------------------------
|
|
class LogosProviderPlugin {
|
|
public:
|
|
virtual ~LogosProviderPlugin() = default;
|
|
virtual LogosProviderObject* createProviderObject() = 0;
|
|
};
|
|
|
|
#define LogosProviderPlugin_iid "org.logos.LogosProviderPlugin"
|
|
Q_DECLARE_INTERFACE(LogosProviderPlugin, LogosProviderPlugin_iid)
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Macros — the developer-facing API
|
|
// ---------------------------------------------------------------------------
|
|
|
|
// LOGOS_PROVIDER: declares providerName/providerVersion and a private typedef.
|
|
// Place at the top of the class body (like Q_OBJECT).
|
|
#define LOGOS_PROVIDER(ClassName, Name, Version) \
|
|
public: \
|
|
QString providerName() const override { return Name; } \
|
|
QString providerVersion() const override { return Version; } \
|
|
QVariant callMethod(const QString& methodName, const QVariantList& args) override; \
|
|
QJsonArray getMethods() override; \
|
|
private: \
|
|
using _LogosProviderThisType = ClassName;
|
|
|
|
// LOGOS_METHOD: marks a method as callable by the framework.
|
|
// Expands to nothing — scanned by logos-cpp-generator to produce
|
|
// callMethod() dispatch and getMethods() metadata (like Q_INVOKABLE + MOC).
|
|
#define LOGOS_METHOD
|
|
|
|
#endif // LOGOS_PROVIDER_OBJECT_H
|