@dusted/anqst 0.1.1 → 0.1.3

package/dist/src/emit.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateOutputs = generateOutputs;
 exports.writeGeneratedOutputs = writeGeneratedOutputs;
-exports.installTypeScriptOutputs = installTypeScriptOutputs;
 exports.installEmbeddedWebBundle = installEmbeddedWebBundle;
 exports.installQtIntegrationCMake = installQtIntegrationCMake;
 exports.installQtDesignerPluginCMake = installQtDesignerPluginCMake;
@@ -13,6 +12,8 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const typescript_1 = __importDefault(require("typescript"));
 const pngjs_1 = require("pngjs");
+const build_stamp_1 = require("./build-stamp");
+const layout_1 = require("./layout");
 function stripAnQstType(typeText) {
     return typeText
         .replace(/\bAnQst\.Type\.stringArray\b/g, "string[]")
@@ -349,7 +350,7 @@ function normalizeImportPathForGenerated(specFilePath, generatedFileRelPath, mod
         return moduleSpecifier;
     }
     const specDir = node_path_1.default.dirname(specFilePath);
-    const generatedAbs = node_path_1.default.resolve(node_path_1.default.dirname(specFilePath), "generated_output", generatedFileRelPath);
+    const generatedAbs = node_path_1.default.resolve(node_path_1.default.dirname(specFilePath), "generated", generatedFileRelPath);
     const generatedDir = node_path_1.default.dirname(generatedAbs);
     const resolvedModulePath = node_path_1.default.resolve(specDir, moduleSpecifier);
     const relative = node_path_1.default.relative(generatedDir, resolvedModulePath);
@@ -652,13 +653,24 @@ ${decls}
 ${metatypes}
 `;
 }
+function renderWidgetUmbrellaHeader(spec) {
+    return `#pragma once
+// Built by <AnQst_version>
+#include "${spec.widgetName}Widget.h"
+#include "${spec.widgetName}Types.h"
+`;
+}
 function renderWidgetHeader(spec, cppTypes) {
+    const widgetClassName = `${spec.widgetName}Widget`;
     const callbackAliases = [];
     const publicMethods = [];
+    const slotMethods = [];
+    const handleMethods = [];
+    const callSetterMethods = [];
     const signals = [];
     const properties = [];
     const fields = [];
-    const outputSetters = [];
+    const publicSlots = [];
     const bindings = [];
     for (const service of spec.services) {
         for (const member of service.members) {
@@ -666,21 +678,20 @@ function renderWidgetHeader(spec, cppTypes) {
             const memberPascal = pascalCase(member.name);
             if (member.kind === "Call" && member.payloadTypeText) {
                 const cppType = cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]);
-                const args = member.parameters.map((p) => `${cppTypes.mapTypeText(p.typeText, [service.name, member.name, p.name])} ${p.name}`).join(", ");
+                const args = member.parameters.map((p) => `const ${cppTypes.mapTypeText(p.typeText, [service.name, member.name, p.name])}& ${p.name}`).join(", ");
                 callbackAliases.push(`using ${memberPascal}Handler = std::function<${cppType}(${args})>;`);
-                publicMethods.push(`void set${memberPascal}Handler(const ${memberPascal}Handler& handler);`);
+                handleMethods.push(`    void ${member.name}(const ${memberPascal}Handler& handler) const;`);
+                callSetterMethods.push(`void set${memberPascal}CallHandler(const ${memberPascal}Handler& handler);`);
                 fields.push(`${memberPascal}Handler m_${member.name}Handler;`);
             }
             else if (member.kind === "Emitter") {
-                const args = member.parameters.map((p) => `${cppTypes.mapTypeText(p.typeText, [service.name, member.name, p.name])} ${p.name}`).join(", ");
-                callbackAliases.push(`using ${memberPascal}Handler = std::function<void(${args})>;`);
-                publicMethods.push(`void set${memberPascal}Handler(const ${memberPascal}Handler& handler);`);
-                fields.push(`${memberPascal}Handler m_${member.name}Handler;`);
+                const args = member.parameters.map((p) => `const ${cppTypes.mapTypeText(p.typeText, [service.name, member.name, p.name])}& ${p.name}`).join(", ");
+                signals.push(`void ${member.name}(${args});`);
             }
             else if (member.kind === "Slot") {
                 const ret = member.payloadTypeText ? cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]) : "void";
                 const args = member.parameters.map((p) => `${cppTypes.mapTypeText(p.typeText, [service.name, member.name, p.name])} ${p.name}`).join(", ");
-                publicMethods.push(`${ret} ${member.name}(${args}${args ? ", " : ""}bool* ok = nullptr, QString* error = nullptr);`);
+                slotMethods.push(`${ret} slot_${member.name}(${args});`);
             }
             else if ((member.kind === "Input" || member.kind === "Output") && member.payloadTypeText) {
                 const cppType = cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]);
@@ -696,13 +707,16 @@ function renderWidgetHeader(spec, cppTypes) {
                     fields.push(`${memberPascal}Handler m_${member.name}Handler;`);
                 }
                 else {
-                    outputSetters.push(`void publish${memberPascal}(const ${cppType}& value);`);
+                    publicSlots.push(`void ${member.name}Slot(const ${cppType}& value);`);
                 }
             }
         }
     }
     return `#pragma once
+#include <QDateTime>
 #include <QHash>
+#include <QMetaMethod>
+#include <QQueue>
 #include <QVariant>
 #include <QVariantList>
 #include <functional>
@@ -710,28 +724,54 @@ function renderWidgetHeader(spec, cppTypes) {
 #include "${spec.widgetName}Types.h"
 
 namespace ${spec.widgetName} {
+} // namespace ${spec.widgetName}
+
+using namespace ${spec.widgetName};
 
-class ${spec.widgetName} : public AnQstWebHostBase {
+class ${widgetClassName} : public AnQstWebHostBase {
     Q_OBJECT
 ${properties.map((p) => `    ${p}`).join("\n")}
 
 public:
-    explicit ${spec.widgetName}(QWidget* parent = nullptr);
-    ~${spec.widgetName}() override;
+${callbackAliases.map((s) => `    ${s}`).join("\n")}
+
+    class handle {
+    public:
+        explicit handle(${widgetClassName}* owner) : m_owner(owner) {}
+${handleMethods.join("\n")}
+    private:
+        ${widgetClassName}* m_owner;
+    };
+
+    explicit ${widgetClassName}(QWidget* parent = nullptr);
+    ~${widgetClassName}() override;
     bool enableDebug();
     static constexpr const char* kBootstrapEntryPoint = "index.html";
     static constexpr const char* kBootstrapContentRoot = "qrc:/${spec.widgetName.toLowerCase()}";
     static constexpr const char* kBootstrapBridgeObject = "${spec.widgetName}Bridge";
+    static constexpr int kMaxQueuedCallsPerEndpoint = 1024;
 
-${callbackAliases.map((s) => `    ${s}`).join("\n")}
+    handle handle;
 ${publicMethods.map((s) => `    ${s}`).join("\n")}
-${outputSetters.map((s) => `    ${s}`).join("\n")}
+
+public slots:
+${slotMethods.map((s) => `    ${s}`).join("\n")}
+${publicSlots.map((s) => `    ${s}`).join("\n")}
 
 signals:
 ${signals.map((s) => `    ${s}`).join("\n")}
     void diagnosticsForwarded(const QVariantMap& payload);
 
+protected:
+    void connectNotify(const QMetaMethod& signal) override;
+    void disconnectNotify(const QMetaMethod& signal) override;
+
 private:
+    struct PendingCallInvocation {
+        QString requestId;
+        QVariantList args;
+        QDateTime enqueuedAt;
+    };
     struct BridgeBindingRow {
         const char* service;
         const char* member;
@@ -741,21 +781,37 @@ private:
     static constexpr int kBridgeBindingsCount = ${bindings.length};
     static QString makeBindingKey(const QString& service, const QString& member);
     void installBridgeBindings();
+    bool hasEmitterListeners(const QString& service, const QString& member) const;
     QVariant handleGeneratedCall(const QString& service, const QString& member, const QVariantList& args);
     void handleGeneratedEmitter(const QString& service, const QString& member, const QVariantList& args);
     void handleGeneratedInput(const QString& service, const QString& member, const QVariant& value);
-
+    QVariant waitForCallHandlerAndInvoke(
+        const QString& service,
+        const QString& member,
+        const QString& requestId,
+        int timeoutMs,
+        const std::function<QVariant()>& invokeNow);
+    void removeQueuedCallById(const QString& queueKey, const QString& requestId);
+${callSetterMethods.map((s) => `    ${s}`).join("\n")}
+
+    qulonglong m_callRequestCounter{0};
+    QHash<QString, QQueue<PendingCallInvocation>> m_queuedCalls;
 ${fields.map((f) => `    ${f}`).join("\n")}
 };
-
-} // namespace ${spec.widgetName}
 `;
 }
 function renderCppStub(spec, cppTypes) {
+    const widgetClassName = `${spec.widgetName}Widget`;
     const lines = [];
-    lines.push(`#include "include/${spec.widgetName}.h"`);
+    lines.push(`#include "include/${spec.widgetName}Widget.h"`);
     lines.push(`#include <QDebug>`);
+    lines.push(`#include <QElapsedTimer>`);
+    lines.push(`#include <QEventLoop>`);
     lines.push(`#include <QMetaType>`);
+    lines.push(`#include <QTimer>`);
+    lines.push(`#include <stdexcept>`);
+    lines.push("");
+    lines.push(`using namespace ${spec.widgetName};`);
     lines.push("");
     lines.push(`extern int qInitResources_${spec.widgetName}();`);
     lines.push("");
@@ -772,9 +828,23 @@ function renderCppStub(spec, cppTypes) {
     lines.push("}");
     lines.push("}");
     lines.push("");
-    lines.push(`namespace ${spec.widgetName} {`);
-    lines.push("");
-    lines.push(`const ${spec.widgetName}::BridgeBindingRow ${spec.widgetName}::kBridgeBindings[] = {`);
+    for (const service of spec.services) {
+        for (const member of service.members) {
+            if (member.kind !== "Call" || !member.payloadTypeText)
+                continue;
+            const pascal = pascalCase(member.name);
+            lines.push(`void ${widgetClassName}::handle::${member.name}(const ${pascal}Handler& handler) const {`);
+            lines.push(`    if (m_owner == nullptr) return;`);
+            lines.push(`    m_owner->set${pascal}CallHandler(handler);`);
+            lines.push(`}`);
+            lines.push("");
+            lines.push(`void ${widgetClassName}::set${pascal}CallHandler(const ${pascal}Handler& handler) {`);
+            lines.push(`    m_${member.name}Handler = handler;`);
+            lines.push(`}`);
+            lines.push("");
+        }
+    }
+    lines.push(`const ${widgetClassName}::BridgeBindingRow ${widgetClassName}::kBridgeBindings[] = {`);
     for (const service of spec.services) {
         for (const member of service.members) {
             lines.push(`    {"${service.name}", "${member.name}", "${member.kind}"},`);
@@ -782,7 +852,7 @@ function renderCppStub(spec, cppTypes) {
     }
     lines.push(`};`);
     lines.push("");
-    lines.push(`${spec.widgetName}::${spec.widgetName}(QWidget* parent) : AnQstWebHostBase(parent) {`);
+    lines.push(`${widgetClassName}::${widgetClassName}(QWidget* parent) : AnQstWebHostBase(parent), handle(this) {`);
     lines.push(`    static const bool kResourcesInitialized = []() {`);
     lines.push(`        ::qInitResources_${spec.widgetName}();`);
     lines.push(`        return true;`);
@@ -790,7 +860,7 @@ function renderCppStub(spec, cppTypes) {
     lines.push(`    Q_UNUSED(kResourcesInitialized);`);
     lines.push(`    registerGeneratedMetaTypes();`);
     lines.push(`    installBridgeBindings();`);
-    lines.push(`    QObject::connect(this, &AnQstWebHostBase::onHostError, this, &${spec.widgetName}::diagnosticsForwarded);`);
+    lines.push(`    QObject::connect(this, &AnQstWebHostBase::onHostError, this, &${widgetClassName}::diagnosticsForwarded);`);
     lines.push(`    const bool rootOk = setContentRoot(QString::fromUtf8(kBootstrapContentRoot));`);
     lines.push(`    const bool bridgeOk = setBridgeObject(this, QString::fromUtf8(kBootstrapBridgeObject));`);
     lines.push(`    const bool loadOk = rootOk && bridgeOk && loadEntryPoint(QString::fromUtf8(kBootstrapEntryPoint));`);
@@ -799,17 +869,74 @@ function renderCppStub(spec, cppTypes) {
     lines.push(`    }`);
     lines.push("}");
     lines.push("");
-    lines.push(`${spec.widgetName}::~${spec.widgetName}() = default;`);
+    lines.push(`${widgetClassName}::~${widgetClassName}() = default;`);
     lines.push("");
-    lines.push(`bool ${spec.widgetName}::enableDebug() {`);
+    lines.push(`bool ${widgetClassName}::enableDebug() {`);
     lines.push(`    return AnQstWebHostBase::enableDebug();`);
     lines.push("}");
     lines.push("");
-    lines.push(`QString ${spec.widgetName}::makeBindingKey(const QString& service, const QString& member) {`);
+    lines.push(`QString ${widgetClassName}::makeBindingKey(const QString& service, const QString& member) {`);
     lines.push(`    return service + QStringLiteral("::") + member;`);
     lines.push(`}`);
     lines.push("");
-    lines.push(`void ${spec.widgetName}::installBridgeBindings() {`);
+    lines.push(`void ${widgetClassName}::removeQueuedCallById(const QString& queueKey, const QString& requestId) {`);
+    lines.push(`    if (!m_queuedCalls.contains(queueKey)) return;`);
+    lines.push(`    auto& queue = m_queuedCalls[queueKey];`);
+    lines.push(`    for (int i = 0; i < queue.size(); ++i) {`);
+    lines.push(`        if (queue[i].requestId == requestId) {`);
+    lines.push(`            queue.removeAt(i);`);
+    lines.push(`            break;`);
+    lines.push(`        }`);
+    lines.push(`    }`);
+    lines.push(`}`);
+    lines.push("");
+    lines.push(`QVariant ${widgetClassName}::waitForCallHandlerAndInvoke(`);
+    lines.push(`    const QString& service,`);
+    lines.push(`    const QString& member,`);
+    lines.push(`    const QString& requestId,`);
+    lines.push(`    int timeoutMs,`);
+    lines.push(`    const std::function<QVariant()>& invokeNow) {`);
+    lines.push(`    const QString queueKey = makeBindingKey(service, member);`);
+    lines.push(`    QElapsedTimer timer;`);
+    lines.push(`    timer.start();`);
+    lines.push(`    QEventLoop loop;`);
+    lines.push(`    QTimer tick;`);
+    lines.push(`    tick.setSingleShot(true);`);
+    lines.push(`    QObject::connect(&tick, &QTimer::timeout, &loop, &QEventLoop::quit);`);
+    lines.push(`    while (true) {`);
+    lines.push(`        if (m_queuedCalls.contains(queueKey) && !m_queuedCalls[queueKey].isEmpty() && m_queuedCalls[queueKey].head().requestId == requestId) {`);
+    lines.push(`            m_queuedCalls[queueKey].dequeue();`);
+    lines.push(`            return invokeNow();`);
+    lines.push(`        }`);
+    lines.push(`        if (timeoutMs > 0 && timer.elapsed() >= timeoutMs) {`);
+    lines.push(`            removeQueuedCallById(queueKey, requestId);`);
+    lines.push(`            return QVariantMap{`);
+    lines.push(`                {QStringLiteral("code"), QStringLiteral("BridgeTimeoutError")},`);
+    lines.push(`                {QStringLiteral("message"), QStringLiteral("Call timed out while waiting for callback registration.")},`);
+    lines.push(`                {QStringLiteral("service"), service},`);
+    lines.push(`                {QStringLiteral("member"), member},`);
+    lines.push(`                {QStringLiteral("requestId"), requestId}`);
+    lines.push(`            };`);
+    lines.push(`        }`);
+    lines.push(`        tick.start(10);`);
+    lines.push(`        loop.exec();`);
+    lines.push(`    }`);
+    lines.push(`}`);
+    lines.push("");
+    lines.push(`bool ${widgetClassName}::hasEmitterListeners(const QString& service, const QString& member) const {`);
+    for (const service of spec.services) {
+        for (const member of service.members) {
+            if (member.kind !== "Emitter")
+                continue;
+            lines.push(`    if (service == QStringLiteral("${service.name}") && member == QStringLiteral("${member.name}")) {`);
+            lines.push(`        return isSignalConnected(QMetaMethod::fromSignal(&${widgetClassName}::${member.name}));`);
+            lines.push(`    }`);
+        }
+    }
+    lines.push(`    return false;`);
+    lines.push(`}`);
+    lines.push("");
+    lines.push(`void ${widgetClassName}::installBridgeBindings() {`);
     lines.push(`    setCallHandler([this](const QString& service, const QString& member, const QVariantList& args) -> QVariant {`);
     lines.push(`        return handleGeneratedCall(service, member, args);`);
     lines.push(`    });`);
@@ -821,55 +948,97 @@ function renderCppStub(spec, cppTypes) {
     lines.push(`    });`);
     lines.push(`}`);
     lines.push("");
-    lines.push(`QVariant ${spec.widgetName}::handleGeneratedCall(const QString& service, const QString& member, const QVariantList& args) {`);
+    lines.push(`QVariant ${widgetClassName}::handleGeneratedCall(const QString& service, const QString& member, const QVariantList& args) {`);
     for (const service of spec.services) {
         for (const member of service.members) {
             if (member.kind !== "Call" || !member.payloadTypeText)
                 continue;
+            const timeoutMs = member.timeoutMs;
             const cppType = cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]);
-            const pascal = pascalCase(member.name);
             lines.push(`    if (service == QStringLiteral("${service.name}") && member == QStringLiteral("${member.name}")) {`);
-            lines.push(`        if (!m_${member.name}Handler) {`);
-            lines.push(`            if (property("anqstDesignerContext").toBool()) {`);
-            lines.push(`                return ${cppToVariantExpression(cppType, designerPlaceholderCppExpression(cppType, member.name))};`);
-            lines.push(`            }`);
-            lines.push(`            return QVariant();`);
-            lines.push(`        }`);
             for (let i = 0; i < member.parameters.length; i++) {
                 const p = member.parameters[i];
                 const pType = cppTypes.mapTypeText(p.typeText, [service.name, member.name, p.name]);
                 lines.push(`        const ${pType} ${p.name} = ${variantToCppExpression(pType, `args.value(${i})`)};`);
             }
-            const argNames = member.parameters.map((p) => p.name).join(", ");
-            lines.push(`        const ${cppType} result = m_${member.name}Handler(${argNames});`);
-            lines.push(`        return ${cppToVariantExpression(cppType, "result")};`);
+            lines.push(`        const QString requestId = QStringLiteral("call-%1").arg(++m_callRequestCounter);`);
+            lines.push(`        const QString queueKey = makeBindingKey(QStringLiteral("${service.name}"), QStringLiteral("${member.name}"));`);
+            lines.push(`        auto invokeNow = [this, requestId${member.parameters.length > 0 ? `, ${member.parameters.map((p) => p.name).join(", ")}` : ""}]() -> QVariant {`);
+            lines.push(`            if (!m_${member.name}Handler) {`);
+            lines.push(`                return QVariantMap{`);
+            lines.push(`                    {QStringLiteral("code"), QStringLiteral("HandlerNotRegisteredError")},`);
+            lines.push(`                    {QStringLiteral("message"), QStringLiteral("No callback registered for Call endpoint.")},`);
+            lines.push(`                    {QStringLiteral("service"), QStringLiteral("${service.name}")},`);
+            lines.push(`                    {QStringLiteral("member"), QStringLiteral("${member.name}")},`);
+            lines.push(`                    {QStringLiteral("requestId"), requestId}`);
+            lines.push(`                };`);
+            lines.push(`            }`);
+            lines.push(`            try {`);
+            const callArgs = member.parameters.map((p) => p.name).join(", ");
+            lines.push(`                const ${cppType} result = m_${member.name}Handler(${callArgs});`);
+            lines.push(`                return ${cppToVariantExpression(cppType, "result")};`);
+            lines.push(`            } catch (const std::exception& ex) {`);
+            lines.push(`                return QVariantMap{`);
+            lines.push(`                    {QStringLiteral("code"), QStringLiteral("CallHandlerError")},`);
+            lines.push(`                    {QStringLiteral("message"), QString::fromUtf8(ex.what())},`);
+            lines.push(`                    {QStringLiteral("service"), QStringLiteral("${service.name}")},`);
+            lines.push(`                    {QStringLiteral("member"), QStringLiteral("${member.name}")},`);
+            lines.push(`                    {QStringLiteral("requestId"), requestId}`);
+            lines.push(`                };`);
+            lines.push(`            } catch (...) {`);
+            lines.push(`                return QVariantMap{`);
+            lines.push(`                    {QStringLiteral("code"), QStringLiteral("CallHandlerError")},`);
+            lines.push(`                    {QStringLiteral("message"), QStringLiteral("Call handler threw unknown exception.")},`);
+            lines.push(`                    {QStringLiteral("service"), QStringLiteral("${service.name}")},`);
+            lines.push(`                    {QStringLiteral("member"), QStringLiteral("${member.name}")},`);
+            lines.push(`                    {QStringLiteral("requestId"), requestId}`);
+            lines.push(`                };`);
+            lines.push(`            }`);
+            lines.push(`        };`);
+            lines.push(`        if (m_${member.name}Handler) {`);
+            lines.push(`            return invokeNow();`);
+            lines.push(`        }`);
+            lines.push(`        auto& queue = m_queuedCalls[queueKey];`);
+            lines.push(`        if (queue.size() >= kMaxQueuedCallsPerEndpoint) {`);
+            lines.push(`            queue.dequeue();`);
+            lines.push(`        }`);
+            lines.push(`        queue.enqueue(PendingCallInvocation{requestId, args, QDateTime::currentDateTimeUtc()});`);
+            lines.push(`        return waitForCallHandlerAndInvoke(QStringLiteral("${service.name}"), QStringLiteral("${member.name}"), requestId, ${timeoutMs}, invokeNow);`);
             lines.push(`    }`);
         }
     }
-    lines.push(`    return QVariant();`);
+    lines.push(`    return QVariantMap{`);
+    lines.push(`        {QStringLiteral("code"), QStringLiteral("HandlerNotRegisteredError")},`);
+    lines.push(`        {QStringLiteral("message"), QStringLiteral("No Call mapping found.")},`);
+    lines.push(`        {QStringLiteral("service"), service},`);
+    lines.push(`        {QStringLiteral("member"), member},`);
+    lines.push(`        {QStringLiteral("requestId"), QString()}`);
+    lines.push(`    };`);
     lines.push(`}`);
     lines.push("");
-    lines.push(`void ${spec.widgetName}::handleGeneratedEmitter(const QString& service, const QString& member, const QVariantList& args) {`);
+    lines.push(`void ${widgetClassName}::handleGeneratedEmitter(const QString& service, const QString& member, const QVariantList& args) {`);
+    lines.push(`    if (!hasEmitterListeners(service, member)) {`);
+    lines.push(`        return;`);
+    lines.push(`    }`);
     for (const service of spec.services) {
         for (const member of service.members) {
             if (member.kind !== "Emitter")
                 continue;
             lines.push(`    if (service == QStringLiteral("${service.name}") && member == QStringLiteral("${member.name}")) {`);
-            lines.push(`        if (!m_${member.name}Handler) return;`);
             for (let i = 0; i < member.parameters.length; i++) {
                 const p = member.parameters[i];
                 const pType = cppTypes.mapTypeText(p.typeText, [service.name, member.name, p.name]);
                 lines.push(`        const ${pType} ${p.name} = ${variantToCppExpression(pType, `args.value(${i})`)};`);
             }
             const argNames = member.parameters.map((p) => p.name).join(", ");
-            lines.push(`        m_${member.name}Handler(${argNames});`);
+            lines.push(`        emit ${member.name}(${argNames});`);
             lines.push(`        return;`);
             lines.push(`    }`);
         }
     }
     lines.push(`}`);
     lines.push("");
-    lines.push(`void ${spec.widgetName}::handleGeneratedInput(const QString& service, const QString& member, const QVariant& value) {`);
+    lines.push(`void ${widgetClassName}::handleGeneratedInput(const QString& service, const QString& member, const QVariant& value) {`);
     for (const service of spec.services) {
         for (const member of service.members) {
             if (member.kind !== "Input" || !member.payloadTypeText)
@@ -888,20 +1057,8 @@ function renderCppStub(spec, cppTypes) {
     for (const service of spec.services) {
         for (const member of service.members) {
             const memberPascal = pascalCase(member.name);
-            if ((member.kind === "Call" || member.kind === "Input") && member.payloadTypeText) {
-                lines.push(`void ${spec.widgetName}::set${memberPascal}Handler(const ${memberPascal}Handler& handler) {`);
-                lines.push(`    m_${member.name}Handler = handler;`);
-                lines.push("}");
-                lines.push("");
-            }
-            else if (member.kind === "Emitter") {
-                lines.push(`void ${spec.widgetName}::set${memberPascal}Handler(const ${memberPascal}Handler& handler) {`);
-                lines.push(`    m_${member.name}Handler = handler;`);
-                lines.push("}");
-                lines.push("");
-            }
-            else if (member.kind === "Input" && member.payloadTypeText) {
-                lines.push(`void ${spec.widgetName}::set${memberPascal}Handler(const ${memberPascal}Handler& handler) {`);
+            if (member.kind === "Input" && member.payloadTypeText) {
+                lines.push(`void ${widgetClassName}::set${memberPascal}Handler(const ${memberPascal}Handler& handler) {`);
                 lines.push(`    m_${member.name}Handler = handler;`);
                 lines.push("}");
                 lines.push("");
@@ -909,8 +1066,7 @@ function renderCppStub(spec, cppTypes) {
             if (member.kind === "Slot") {
                 const ret = member.payloadTypeText ? cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]) : "void";
                 const args = member.parameters.map((p) => `${cppTypes.mapTypeText(p.typeText, [service.name, member.name, p.name])} ${p.name}`).join(", ");
-                const argsWithMeta = `${args}${args ? ", " : ""}bool* ok, QString* error`;
-                lines.push(`${ret} ${spec.widgetName}::${member.name}(${argsWithMeta}) {`);
+                lines.push(`${ret} ${widgetClassName}::slot_${member.name}(${args}) {`);
                 lines.push(`    QVariantList invokeArgs;`);
                 for (const p of member.parameters) {
                     const pType = mapTsTypeToCpp(p.typeText);
@@ -919,14 +1075,18 @@ function renderCppStub(spec, cppTypes) {
                 lines.push(`    QVariant result;`);
                 lines.push(`    QString invokeError;`);
                 lines.push(`    const bool success = invokeSlot(QStringLiteral("${service.name}"), QStringLiteral("${member.name}"), invokeArgs, &result, &invokeError);`);
-                lines.push(`    if (ok != nullptr) *ok = success;`);
-                lines.push(`    if (error != nullptr) *error = invokeError;`);
+                lines.push(`    if (!success) {`);
+                lines.push(`        if (invokeError == QStringLiteral("slot invocation timeout")) {`);
+                lines.push(`            const QString timeoutMsg = QStringLiteral("[Timeout] ${service.name}.${member.name}: The webapp inside the widget did not anwser within %1 ms.").arg(slotInvocationTimeoutMs());`);
+                lines.push(`            throw std::runtime_error(timeoutMsg.toStdString());`);
+                lines.push(`        }`);
+                lines.push(`        const QString requestFailed = QStringLiteral("[RequestFailed]: %1").arg(invokeError);`);
+                lines.push(`        throw std::runtime_error(requestFailed.toStdString());`);
+                lines.push(`    }`);
                 if (ret === "void") {
-                    lines.push(`    if (!success) return;`);
                     lines.push(`    return;`);
                 }
                 else {
-                    lines.push(`    if (!success) return ${ret}{};`);
                     lines.push(`    return ${variantToCppExpression(ret, "result")};`);
                 }
                 lines.push("}");
@@ -935,11 +1095,11 @@ function renderCppStub(spec, cppTypes) {
             else if ((member.kind === "Input" || member.kind === "Output") && member.payloadTypeText) {
                 const cppType = cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]);
                 const cap = member.name.charAt(0).toUpperCase() + member.name.slice(1);
-                lines.push(`${cppType} ${spec.widgetName}::${member.name}() const {`);
+                lines.push(`${cppType} ${widgetClassName}::${member.name}() const {`);
                 lines.push(`    return m_${member.name};`);
                 lines.push("}");
                 lines.push("");
-                lines.push(`void ${spec.widgetName}::set${cap}(const ${cppType}& value) {`);
+                lines.push(`void ${widgetClassName}::set${cap}(const ${cppType}& value) {`);
                 lines.push(`    if (m_${member.name} == value) return;`);
                 lines.push(`    m_${member.name} = value;`);
                 if (member.kind === "Output") {
@@ -949,7 +1109,7 @@ function renderCppStub(spec, cppTypes) {
                 lines.push("}");
                 lines.push("");
                 if (member.kind === "Output") {
-                    lines.push(`void ${spec.widgetName}::publish${pascalCase(member.name)}(const ${cppType}& value) {`);
+                    lines.push(`void ${widgetClassName}::${member.name}Slot(const ${cppType}& value) {`);
                     lines.push(`    set${cap}(value);`);
                     lines.push(`}`);
                     lines.push("");
@@ -957,7 +1117,16 @@ function renderCppStub(spec, cppTypes) {
             }
         }
     }
-    lines.push(`} // namespace ${spec.widgetName}`);
+    lines.push(`void ${widgetClassName}::connectNotify(const QMetaMethod& signal) {`);
+    lines.push(`    AnQstWebHostBase::connectNotify(signal);`);
+    lines.push(`    Q_UNUSED(signal);`);
+    lines.push(`}`);
+    lines.push("");
+    lines.push(`void ${widgetClassName}::disconnectNotify(const QMetaMethod& signal) {`);
+    lines.push(`    AnQstWebHostBase::disconnectNotify(signal);`);
+    lines.push(`    Q_UNUSED(signal);`);
+    lines.push(`}`);
+    lines.push("");
     return lines.join("\n");
 }
 function renderCMake(spec) {
@@ -977,6 +1146,7 @@ add_library(${spec.widgetName}Widget
     ${spec.widgetName}.cpp
     ${spec.widgetName}.qrc
     include/${spec.widgetName}.h
+    include/${spec.widgetName}Widget.h
     include/${spec.widgetName}Types.h
 )
 target_include_directories(${spec.widgetName}Widget
@@ -1002,24 +1172,7 @@ function normalizeSlashes(value) {
     return value.split(node_path_1.default.sep).join("/");
 }
 function resolveActiveBuildStamp() {
-    const fromEnv = process.env.ANQST_BUILD_STAMP?.trim();
-    if (fromEnv && fromEnv.length > 0) {
-        return fromEnv;
-    }
-    const activePath = node_path_1.default.resolve(__dirname, "..", "..", ".anqstgen-version-active.json");
-    if (!node_fs_1.default.existsSync(activePath)) {
-        return "";
-    }
-    try {
-        const parsed = JSON.parse(node_fs_1.default.readFileSync(activePath, "utf8"));
-        if (typeof parsed.active === "string" && parsed.active.trim().length > 0) {
-            return parsed.active.trim();
-        }
-    }
-    catch {
-        return "";
-    }
-    return "";
+    return build_stamp_1.ANQST_BUILD_STAMP.trim();
 }
 function withBuildStamp(relativePath, content) {
     const stamp = resolveActiveBuildStamp();
@@ -1114,6 +1267,12 @@ function renderLocalTypeImports(spec) {
         return "";
     return `import type { ${localTypeNames.join(", ")} } from "./types";`;
 }
+function slotHandlerReturnType(tsRet) {
+    if (tsRet === "void") {
+        return "void | Promise<void> | Error";
+    }
+    return `${tsRet} | Promise<${tsRet}> | Error`;
+}
 function renderTsService(spec, serviceName) {
     const members = spec.services.find((s) => s.name === serviceName)?.members ?? [];
     const fieldLines = [];
@@ -1137,7 +1296,7 @@ function renderTsService(spec, serviceName) {
         }
         if (m.kind === "Slot") {
             const ret = mapTypeTextToTs(m.payloadTypeText ?? "void");
-            onSlotMembers.push(`    ${m.name}: (handler: (${args}) => ${ret}): void => {`);
+            onSlotMembers.push(`    ${m.name}: (handler: (${args}) => ${slotHandlerReturnType(ret)}): void => {`);
             onSlotMembers.push(`      this._bridge.registerSlot("${serviceName}", "${m.name}", handler as (...args: unknown[]) => unknown);`);
             onSlotMembers.push("    },");
             continue;
@@ -1197,7 +1356,7 @@ function renderTsServiceDts(spec, serviceName) {
         }
         if (m.kind === "Slot") {
             const ret = mapTypeTextToTs(m.payloadTypeText ?? "void");
-            onSlotMembers.push(`  ${m.name}(handler: (${args}) => ${ret}): void;`);
+            onSlotMembers.push(`  ${m.name}(handler: (${args}) => ${slotHandlerReturnType(ret)}): void;`);
             continue;
         }
         if ((m.kind === "Input" || m.kind === "Output") && m.payloadTypeText) {
@@ -1226,7 +1385,7 @@ export declare class ${serviceName} {
 }
 function renderTsServices(spec) {
     const serviceClasses = spec.services.map((s) => renderTsService(spec, s.name)).join("\n");
-    const externalTypeImports = renderRequiredTypeImports(spec, "npmpackage/services.ts").trim();
+    const externalTypeImports = renderRequiredTypeImports(spec, `frontend/${(0, layout_1.generatedFrontendDirName)(spec.widgetName)}/services.ts`).trim();
     const localTypeImports = renderLocalTypeImports(spec).trim();
     const typeImports = [externalTypeImports, localTypeImports].filter((s) => s.length > 0).join("\n");
     const typeImportsBlock = typeImports.length > 0 ? `${typeImports}\n\n` : "";
@@ -1267,6 +1426,24 @@ interface BridgeAdapter {
   onSlotInvocation(handler: SlotInvocationListener): void;
 }
 
+function isBridgeCallError(value: unknown): value is {
+  code: unknown;
+  message: unknown;
+  service: unknown;
+  member: unknown;
+  requestId: unknown;
+} {
+  if (value === null || typeof value !== "object") return false;
+  const row = value as Record<string, unknown>;
+  return (
+    Object.prototype.hasOwnProperty.call(row, "code")
+    && Object.prototype.hasOwnProperty.call(row, "message")
+    && Object.prototype.hasOwnProperty.call(row, "service")
+    && Object.prototype.hasOwnProperty.call(row, "member")
+    && Object.prototype.hasOwnProperty.call(row, "requestId")
+  );
+}
+
 class QtWebChannelAdapter implements BridgeAdapter {
   private constructor(private readonly host: HostBridgeApi) {}
 
@@ -1300,8 +1477,14 @@ class QtWebChannelAdapter implements BridgeAdapter {
   }
 
   async call<T>(service: string, member: string, args: unknown[]): Promise<T> {
-    return new Promise<T>((resolve) => {
-      this.host.anQstBridge_call(service, member, args, (result) => resolve(result as T));
+    return new Promise<T>((resolve, reject) => {
+      this.host.anQstBridge_call(service, member, args, (result) => {
+        if (isBridgeCallError(result)) {
+          reject(result);
+          return;
+        }
+        resolve(result as T);
+      });
     });
   }
 
@@ -1331,7 +1514,13 @@ class QtWebChannelAdapter implements BridgeAdapter {
 }
 
 class WebSocketBridgeAdapter implements BridgeAdapter {
-  private readonly pending = new Map<string, (result: unknown) => void>();
+  private readonly pending = new Map<string, {
+    service: string;
+    member: string;
+    requestId: string;
+    resolve: (result: unknown) => void;
+    reject: (error: unknown) => void;
+  }>();
   private readonly outputListeners: OutputListener[] = [];
   private readonly slotListeners: SlotInvocationListener[] = [];
   private requestCounter = 0;
@@ -1343,10 +1532,15 @@ class WebSocketBridgeAdapter implements BridgeAdapter {
       const type = String(message["type"] ?? "");
       if (type === "callResult") {
         const requestId = String(message["requestId"] ?? "");
-        const resolver = this.pending.get(requestId);
-        if (resolver) {
+        const pending = this.pending.get(requestId);
+        if (pending) {
           this.pending.delete(requestId);
-          resolver(message["result"]);
+          const result = message["result"];
+          if (isBridgeCallError(result)) {
+            pending.reject(result);
+            return;
+          }
+          pending.resolve(result);
         }
         return;
       }
@@ -1377,6 +1571,18 @@ class WebSocketBridgeAdapter implements BridgeAdapter {
         this.socket.close();
       }
     });
+    this.socket.addEventListener("close", () => {
+      for (const pending of this.pending.values()) {
+        pending.reject({
+          code: "BridgeDisconnectedError",
+          message: "Bridge disconnected before call completion.",
+          service: pending.service,
+          member: pending.member,
+          requestId: pending.requestId
+        });
+      }
+      this.pending.clear();
+    });
   }
 
   static async create(): Promise<WebSocketBridgeAdapter> {
@@ -1408,8 +1614,14 @@ class WebSocketBridgeAdapter implements BridgeAdapter {
   async call<T>(service: string, member: string, args: unknown[]): Promise<T> {
     const requestId = \`req-\${++this.requestCounter}\`;
     const payload = { type: "call", requestId, service, member, args };
-    return await new Promise<T>((resolve) => {
-      this.pending.set(requestId, (value) => resolve(value as T));
+    return await new Promise<T>((resolve, reject) => {
+      this.pending.set(requestId, {
+        service,
+        member,
+        requestId,
+        resolve: (value) => resolve(value as T),
+        reject
+      });
       this.socket.send(JSON.stringify(payload));
     });
   }
@@ -1520,7 +1732,7 @@ class AnQstBridgeRuntime {
         outputHandler(value);
       }
     });
-    this.adapter.onSlotInvocation((requestId, service, member, args) => {
+    this.adapter.onSlotInvocation(async (requestId, service, member, args) => {
       const key = this.key(service, member);
       const handler = this.slotHandlers.get(key);
       if (handler === undefined) {
@@ -1528,10 +1740,15 @@ class AnQstBridgeRuntime {
         return;
       }
       try {
-        const result = handler(...args);
+        const result = await Promise.resolve(handler(...args));
+        if (result instanceof Error) {
+          this.adapter!.resolveSlot(requestId, false, undefined, result.message);
+          return;
+        }
         this.adapter!.resolveSlot(requestId, true, result, "");
       } catch (error) {
-        this.adapter!.resolveSlot(requestId, false, undefined, String(error));
+        const message = error instanceof Error ? error.message : String(error);
+        this.adapter!.resolveSlot(requestId, false, undefined, message);
       }
     });
     for (const key of this.slotHandlers.keys()) {
@@ -1551,13 +1768,13 @@ ${serviceClasses}
 `;
 }
 function renderTsTypes(spec) {
-    const typeImports = renderRequiredTypeImports(spec, "npmpackage/types.ts").trim();
+    const typeImports = renderRequiredTypeImports(spec, `frontend/${(0, layout_1.generatedFrontendDirName)(spec.widgetName)}/types.ts`).trim();
     const typeDecls = renderTypeDeclarations(spec, true).trim();
     const sections = [typeImports, typeDecls].filter((s) => s.length > 0);
     return sections.length > 0 ? `${sections.join("\n\n")}\n` : "";
 }
 function renderTypeServicesDts(spec) {
-    const externalTypeImports = renderRequiredTypeImports(spec, "npmpackage/types/services.d.ts").trim();
+    const externalTypeImports = renderRequiredTypeImports(spec, `frontend/${(0, layout_1.generatedFrontendDirName)(spec.widgetName)}/types/services.d.ts`).trim();
     const localTypeImports = renderLocalTypeImports(spec).trim();
     const serviceDecls = spec.services
         .map((s) => renderTsServiceDts(spec, s.name))
@@ -1566,7 +1783,7 @@ function renderTypeServicesDts(spec) {
     return sections.length > 0 ? `${sections.join("\n\n")}\n` : "";
 }
 function renderTypeTypesDts(spec) {
-    const typeImports = renderRequiredTypeImports(spec, "npmpackage/types/types.d.ts").trim();
+    const typeImports = renderRequiredTypeImports(spec, `frontend/${(0, layout_1.generatedFrontendDirName)(spec.widgetName)}/types/types.d.ts`).trim();
     const typeDecls = renderTypeDeclarations(spec, true).trim();
     const sections = [typeImports, typeDecls].filter((s) => s.length > 0);
     return sections.length > 0 ? `${sections.join("\n\n")}\n` : "";
@@ -1632,13 +1849,13 @@ function nodeCap(value) {
     return value.length === 0 ? value : `${value.charAt(0).toUpperCase()}${value.slice(1)}`;
 }
 function renderNodeExpressWsTypes(spec) {
-    const typeImports = renderRequiredTypeImports(spec, `${generatedNodeExpressWsDirName(spec.widgetName)}/types/index.d.ts`).trim();
+    const typeImports = renderRequiredTypeImports(spec, `backend/node/express/${generatedNodeExpressWsDirName(spec.widgetName)}/types/index.d.ts`).trim();
     const typeDecls = renderTypeDeclarations(spec, true).trim();
     const sections = [typeImports, typeDecls].filter((s) => s.length > 0);
     return sections.length > 0 ? `${sections.join("\n\n")}\n` : "";
 }
 function renderNodeExpressWsIndex(spec) {
-    const typeImports = renderRequiredTypeImports(spec, `${generatedNodeExpressWsDirName(spec.widgetName)}/index.ts`);
+    const typeImports = renderRequiredTypeImports(spec, `backend/node/express/${generatedNodeExpressWsDirName(spec.widgetName)}/index.ts`);
     const typeDecls = renderTypeDeclarations(spec, true);
     const handlerBridgeTypeName = `${spec.widgetName}HandlerBridge`;
     const sessionBridgeTypeName = `${spec.widgetName}SessionBridge`;
@@ -1764,7 +1981,7 @@ function renderNodeExpressWsIndex(spec) {
         sendJson(session.socket, {
           type: "callResult",
           requestId,
-          result: { __anqstError: { code: "HandlerNotRegisteredError", message: err.message, service, member } }
+          result: { code: "HandlerNotRegisteredError", message: err.message, service, member, requestId }
         });
         throw err;
       }
@@ -1786,7 +2003,7 @@ function renderNodeExpressWsIndex(spec) {
           sendJson(session.socket, {
             type: "callResult",
             requestId,
-            result: { __anqstError: { code: "CallHandlerError", message, service, member } }
+            result: { code: "CallHandlerError", message, service, member, requestId }
           });
         });
       return;
@@ -2138,7 +2355,7 @@ export interface ${spec.widgetName}NodeBridge {
 export function create${spec.widgetName}NodeExpressWsBridge(options: ${spec.widgetName}NodeBridgeOptions): ${spec.widgetName}NodeBridge {
   const wsPath = options.wsPath ?? "/anqst-bridge";
   const devConfigPath = options.devConfigPath ?? "/anqst-dev-config.json";
-  const defaultSlotTimeoutMs = options.defaultSlotTimeoutMs ?? 120000;
+  const defaultSlotTimeoutMs = options.defaultSlotTimeoutMs ?? 1000;
   const maxQueuedPerSlot = options.maxQueuedSlotInvocationsPerSlot ?? 1024;
   const sessions = new Map<WebSocket, ${spec.widgetName}NodeSession>();
   const diagnosticListeners = new Set<(diagnostic: AnQstDiagnostic) => void>();
@@ -2230,7 +2447,7 @@ ${callDispatch}
       sendJson(session.socket, {
         type: "callResult",
         requestId,
-        result: { __anqstError: { code: "HandlerNotRegisteredError", message: err.message, service, member } }
+        result: { code: "HandlerNotRegisteredError", message: err.message, service, member, requestId }
       });
       throw err;
     }
@@ -2337,32 +2554,34 @@ function renderTypeRootIndexDts(spec) {
     return sections.length > 0 ? `${sections.join("\n\n")}\n` : "";
 }
 function generatedCppLibraryDirName(widgetName) {
-    return `${widgetName}_QtWidget`;
+    return (0, layout_1.generatedQtWidgetDirName)(widgetName);
 }
 function generatedNodeExpressWsDirName(widgetName) {
-    return `${widgetName}_node_express_ws`;
+    return (0, layout_1.generatedNodeExpressDirName)(widgetName);
 }
 function generateOutputs(spec, options = { emitQWidget: true, emitAngularService: true, emitNodeExpressWs: false }) {
-    const cppDir = generatedCppLibraryDirName(spec.widgetName);
-    const nodeDir = generatedNodeExpressWsDirName(spec.widgetName);
+    const frontendDir = `frontend/${(0, layout_1.generatedFrontendDirName)(spec.widgetName)}`;
+    const cppDir = `backend/cpp/qt/${generatedCppLibraryDirName(spec.widgetName)}`;
+    const nodeDir = `backend/node/express/${generatedNodeExpressWsDirName(spec.widgetName)}`;
     const outputs = {};
     if (options.emitAngularService) {
-        outputs["npmpackage/package.json"] = renderNpmPackage(spec);
-        outputs["npmpackage/index.ts"] = renderTsIndex();
-        outputs["npmpackage/services.ts"] = renderTsServices(spec);
-        outputs["npmpackage/types.ts"] = renderTsTypes(spec);
-        outputs["npmpackage/index.js"] = renderJsIndex();
-        outputs["npmpackage/services.js"] = renderJsServices();
-        outputs["npmpackage/types.js"] = renderJsTypes();
-        outputs["npmpackage/types/index.d.ts"] = renderTypeRootIndexDts(spec);
-        outputs["npmpackage/types/services.d.ts"] = renderTypeServicesDts(spec);
-        outputs["npmpackage/types/types.d.ts"] = renderTypeTypesDts(spec);
+        outputs[`${frontendDir}/package.json`] = renderNpmPackage(spec);
+        outputs[`${frontendDir}/index.ts`] = renderTsIndex();
+        outputs[`${frontendDir}/services.ts`] = renderTsServices(spec);
+        outputs[`${frontendDir}/types.ts`] = renderTsTypes(spec);
+        outputs[`${frontendDir}/index.js`] = renderJsIndex();
+        outputs[`${frontendDir}/services.js`] = renderJsServices();
+        outputs[`${frontendDir}/types.js`] = renderJsTypes();
+        outputs[`${frontendDir}/types/index.d.ts`] = renderTypeRootIndexDts(spec);
+        outputs[`${frontendDir}/types/services.d.ts`] = renderTypeServicesDts(spec);
+        outputs[`${frontendDir}/types/types.d.ts`] = renderTypeTypesDts(spec);
     }
     if (options.emitQWidget) {
         const cppTypes = buildCppTypeContext(spec);
         outputs[`${cppDir}/CMakeLists.txt`] = renderCMake(spec);
         outputs[`${cppDir}/${spec.widgetName}.qrc`] = renderEmbeddedQrc(spec.widgetName, []);
-        outputs[`${cppDir}/include/${spec.widgetName}.h`] = renderWidgetHeader(spec, cppTypes);
+        outputs[`${cppDir}/include/${spec.widgetName}.h`] = renderWidgetUmbrellaHeader(spec);
+        outputs[`${cppDir}/include/${spec.widgetName}Widget.h`] = renderWidgetHeader(spec, cppTypes);
         outputs[`${cppDir}/include/${spec.widgetName}Types.h`] = renderTypesHeader(spec, cppTypes);
         outputs[`${cppDir}/${spec.widgetName}.cpp`] = renderCppStub(spec, cppTypes);
     }
@@ -2374,38 +2593,13 @@ function generateOutputs(spec, options = { emitQWidget: true, emitAngularService
     return outputs;
 }
 function writeGeneratedOutputs(cwd, outputs) {
-    const outputRoot = node_path_1.default.join(cwd, "generated_output");
+    const outputRoot = (0, layout_1.anqstGeneratedRootDir)(cwd);
     for (const [relPath, content] of Object.entries(outputs)) {
         const filePath = node_path_1.default.join(outputRoot, relPath);
         node_fs_1.default.mkdirSync(node_path_1.default.dirname(filePath), { recursive: true });
         node_fs_1.default.writeFileSync(filePath, withBuildStamp(relPath, content), "utf8");
     }
 }
-function installTypeScriptOutputs(cwd) {
-    const sourceDir = node_path_1.default.join(cwd, "generated_output", "npmpackage");
-    const targetDir = node_path_1.default.join(cwd, "src", "anqst-generated");
-    if (!node_fs_1.default.existsSync(sourceDir))
-        return;
-    node_fs_1.default.rmSync(targetDir, { recursive: true, force: true });
-    node_fs_1.default.mkdirSync(targetDir, { recursive: true });
-    const queue = [sourceDir];
-    while (queue.length > 0) {
-        const current = queue.shift();
-        for (const entry of node_fs_1.default.readdirSync(current, { withFileTypes: true })) {
-            const abs = node_path_1.default.join(current, entry.name);
-            const rel = node_path_1.default.relative(sourceDir, abs);
-            const dst = node_path_1.default.join(targetDir, rel);
-            if (entry.isDirectory()) {
-                node_fs_1.default.mkdirSync(dst, { recursive: true });
-                queue.push(abs);
-            }
-            else if (entry.isFile()) {
-                node_fs_1.default.mkdirSync(node_path_1.default.dirname(dst), { recursive: true });
-                node_fs_1.default.copyFileSync(abs, dst);
-            }
-        }
-    }
-}
 function listFilesRecursively(rootDir) {
     const output = [];
     const queue = [rootDir];
@@ -2539,7 +2733,7 @@ function installEmbeddedWebBundle(cwd, widgetName) {
     if (!node_fs_1.default.existsSync(node_path_1.default.join(distWebRoot, "index.html"))) {
         return false;
     }
-    const cppLibraryRoot = node_path_1.default.join(cwd, "generated_output", generatedCppLibraryDirName(widgetName));
+    const cppLibraryRoot = (0, layout_1.resolveGeneratedLayoutPaths)(cwd, widgetName).cppQtWidgetRoot;
     const cppLibraryWebRoot = node_path_1.default.join(cppLibraryRoot, "webapp");
     node_fs_1.default.rmSync(cppLibraryWebRoot, { recursive: true, force: true });
     node_fs_1.default.mkdirSync(cppLibraryWebRoot, { recursive: true });
@@ -2571,15 +2765,15 @@ function normalizeEmbeddedIndexHtml(indexPath, webRoot) {
     node_fs_1.default.writeFileSync(indexPath, html, "utf8");
 }
 function renderQtIntegrationCMake(widgetName) {
-    const generatedRootVar = "ANQST_GENERATED_CPP_DIR";
+    const generatedRootVar = "ANQST_GENERATED_WIDGET_DIR";
     const generatedIncludeVar = "ANQST_GENERATED_INCLUDE_DIR";
-    const webappRootVar = "ANQST_WEBAPP_ROOT";
+    const projectRootVar = "ANQST_PROJECT_ROOT";
     const widgetTarget = `${widgetName}Widget`;
     const autogenTarget = `${widgetTarget}_anqst_codegen`;
     return `cmake_minimum_required(VERSION 3.21)
 
-set(${webappRootVar} "\${CMAKE_CURRENT_LIST_DIR}/..")
-set(${generatedRootVar} "\${${webappRootVar}}/generated_output/${generatedCppLibraryDirName(widgetName)}")
+set(${projectRootVar} "\${CMAKE_CURRENT_LIST_DIR}/../../../../..")
+set(${generatedRootVar} "\${CMAKE_CURRENT_LIST_DIR}/../qt/${generatedCppLibraryDirName(widgetName)}")
 set(${generatedIncludeVar} "\${${generatedRootVar}}/include")
 
 if(TARGET ${widgetTarget})
@@ -2587,7 +2781,7 @@ if(TARGET ${widgetTarget})
 endif()
 
 if(NOT TARGET anqstwebhostbase)
-    message(FATAL_ERROR "Target 'anqstwebhostbase' must exist before including anqst-cmake for ${widgetName}.")
+    message(FATAL_ERROR "Target 'anqstwebhostbase' must exist before including generated AnQst CMake for ${widgetName}.")
 endif()
 
 find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
@@ -2603,11 +2797,12 @@ add_custom_command(
         "\${${generatedRootVar}}/${widgetName}.qrc"
         "\${${generatedRootVar}}/${widgetName}.cpp"
         "\${${generatedIncludeVar}}/${widgetName}.h"
+        "\${${generatedIncludeVar}}/${widgetName}Widget.h"
         "\${${generatedIncludeVar}}/${widgetName}Types.h"
         "\${${generatedRootVar}}/webapp/index.html"
     COMMAND "\${ANQST_NPM_EXECUTABLE}" install
     COMMAND "\${ANQST_NPM_EXECUTABLE}" run anqst:build
-    WORKING_DIRECTORY "\${${webappRootVar}}"
+    WORKING_DIRECTORY "\${${projectRootVar}}"
     COMMENT "Generating AnQst widget library (${widgetTarget}) from Angular project"
     VERBATIM
 )
@@ -2618,6 +2813,7 @@ add_custom_target(${autogenTarget}
         "\${${generatedRootVar}}/${widgetName}.qrc"
         "\${${generatedRootVar}}/${widgetName}.cpp"
         "\${${generatedIncludeVar}}/${widgetName}.h"
+        "\${${generatedIncludeVar}}/${widgetName}Widget.h"
         "\${${generatedIncludeVar}}/${widgetName}Types.h"
         "\${${generatedRootVar}}/webapp/index.html"
 )
@@ -2626,6 +2822,7 @@ set_source_files_properties(
     "\${${generatedRootVar}}/${widgetName}.qrc"
     "\${${generatedRootVar}}/${widgetName}.cpp"
     "\${${generatedIncludeVar}}/${widgetName}.h"
+    "\${${generatedIncludeVar}}/${widgetName}Widget.h"
     "\${${generatedIncludeVar}}/${widgetName}Types.h"
     PROPERTIES GENERATED TRUE
 )
@@ -2634,6 +2831,7 @@ add_library(${widgetTarget}
     "\${${generatedRootVar}}/${widgetName}.qrc"
     "\${${generatedRootVar}}/${widgetName}.cpp"
     "\${${generatedIncludeVar}}/${widgetName}.h"
+    "\${${generatedIncludeVar}}/${widgetName}Widget.h"
     "\${${generatedIncludeVar}}/${widgetName}Types.h"
 )
 add_dependencies(${widgetTarget} ${autogenTarget})
@@ -2648,9 +2846,9 @@ target_link_libraries(${widgetTarget}
 `;
 }
 function installQtIntegrationCMake(cwd, widgetName) {
-    const integrationDir = node_path_1.default.join(cwd, "anqst-cmake");
+    const integrationDir = (0, layout_1.resolveGeneratedLayoutPaths)(cwd, widgetName).cppCmakeRoot;
     node_fs_1.default.mkdirSync(integrationDir, { recursive: true });
-    node_fs_1.default.writeFileSync(node_path_1.default.join(integrationDir, "CMakeLists.txt"), withBuildStamp("anqst-cmake/CMakeLists.txt", renderQtIntegrationCMake(widgetName)), "utf8");
+    node_fs_1.default.writeFileSync(node_path_1.default.join(integrationDir, "CMakeLists.txt"), withBuildStamp("backend/cpp/cmake/CMakeLists.txt", renderQtIntegrationCMake(widgetName)), "utf8");
 }
 function normalizeIcoSize(dim) {
     return dim === 0 ? 256 : dim;
@@ -2821,7 +3019,7 @@ function installDesignerPluginIconAssets(cwd, pluginDir) {
 }
 function renderQtDesignerPluginCpp(widgetName, widgetCategory, hasIcon) {
     const pluginClass = `${widgetName}DesignerPlugin`;
-    const widgetClass = `${widgetName}::${widgetName}`;
+    const widgetClass = `${widgetName}Widget`;
     const groupName = escapeCppStringLiteral(widgetCategory);
     const iconExpression = hasIcon
         ? 'QIcon(QStringLiteral(":/anqstdesignerplugin/plugin-icon.png"))'
@@ -2881,8 +3079,8 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
-set(ANQST_WEBAPP_ROOT "\${CMAKE_CURRENT_LIST_DIR}/../..")
-set(ANQST_WIDGET_DIR "\${ANQST_WEBAPP_ROOT}/generated_output/${generatedCppLibraryDirName(widgetName)}")
+set(ANQST_PROJECT_ROOT "\${CMAKE_CURRENT_LIST_DIR}/../../../../../../..")
+set(ANQST_WIDGET_DIR "\${CMAKE_CURRENT_LIST_DIR}/..")
 set(ANQST_WEBBASE_DIR "" CACHE PATH "Path to AnQstWebBase source directory")
 
 if(NOT EXISTS "\${ANQST_WIDGET_DIR}/CMakeLists.txt")
@@ -2891,10 +3089,10 @@ endif()
 
 if(NOT ANQST_WEBBASE_DIR)
     foreach(candidate
-        "\${ANQST_WEBAPP_ROOT}/AnQstWidget/AnQstWebBase"
-        "\${ANQST_WEBAPP_ROOT}/../AnQstWidget/AnQstWebBase"
-        "\${ANQST_WEBAPP_ROOT}/../../AnQstWidget/AnQstWebBase"
-        "\${ANQST_WEBAPP_ROOT}/../../../AnQstWidget/AnQstWebBase")
+        "\${ANQST_PROJECT_ROOT}/AnQstWidget/AnQstWebBase"
+        "\${ANQST_PROJECT_ROOT}/../AnQstWidget/AnQstWebBase"
+        "\${ANQST_PROJECT_ROOT}/../../AnQstWidget/AnQstWebBase"
+        "\${ANQST_PROJECT_ROOT}/../../../AnQstWidget/AnQstWebBase")
         if(EXISTS "\${candidate}/CMakeLists.txt")
             set(ANQST_WEBBASE_DIR "\${candidate}")
             break()
@@ -2938,11 +3136,11 @@ set_target_properties(${pluginTarget} PROPERTIES
 `;
 }
 function installQtDesignerPluginCMake(cwd, widgetName, options = {}) {
-    const pluginDir = node_path_1.default.join(cwd, "anqst-cmake", "designerplugin");
+    const pluginDir = (0, layout_1.resolveGeneratedLayoutPaths)(cwd, widgetName).designerPluginRoot;
     node_fs_1.default.mkdirSync(pluginDir, { recursive: true });
     const assets = installDesignerPluginIconAssets(cwd, pluginDir);
     const pluginTarget = `${widgetName}DesignerPlugin`;
     const widgetCategory = options.widgetCategory ?? "AnQst Widgets";
-    node_fs_1.default.writeFileSync(node_path_1.default.join(pluginDir, "CMakeLists.txt"), withBuildStamp("anqst-cmake/designerplugin/CMakeLists.txt", renderQtDesignerPluginCMake(widgetName, assets.hasIcon)), "utf8");
-    node_fs_1.default.writeFileSync(node_path_1.default.join(pluginDir, `${pluginTarget}.cpp`), withBuildStamp(`anqst-cmake/designerplugin/${pluginTarget}.cpp`, renderQtDesignerPluginCpp(widgetName, widgetCategory, assets.hasIcon)), "utf8");
+    node_fs_1.default.writeFileSync(node_path_1.default.join(pluginDir, "CMakeLists.txt"), withBuildStamp(`backend/cpp/qt/${generatedCppLibraryDirName(widgetName)}/designerPlugin/CMakeLists.txt`, renderQtDesignerPluginCMake(widgetName, assets.hasIcon)), "utf8");
+    node_fs_1.default.writeFileSync(node_path_1.default.join(pluginDir, `${pluginTarget}.cpp`), withBuildStamp(`backend/cpp/qt/${generatedCppLibraryDirName(widgetName)}/designerPlugin/${pluginTarget}.cpp`, renderQtDesignerPluginCpp(widgetName, widgetCategory, assets.hasIcon)), "utf8");
 }