@dusted/anqst 1.5.0 → 1.5.1

package/dist/src/emit.js

@@ -13,7 +13,7 @@ const node_path_1 = __importDefault(require("node:path"));
 const typescript_1 = __importDefault(require("typescript"));
 const pngjs_1 = require("pngjs");
 const layout_1 = require("./layout");
-const structured_top_level_codecs_1 = require("./structured-top-level-codecs");
+const boundary_codecs_1 = require("./boundary-codecs");
 function stripAnQstType(typeText) {
     return typeText
         .replace(/\bAnQst\.Type\.stringArray\b/g, "string[]")
@@ -83,6 +83,99 @@ function isNumberLikeUnionTypeNode(node) {
         return false;
     });
 }
+function collectFiniteStringLiteralsTypeNode(node) {
+    const values = [];
+    for (const part of node.types) {
+        if (!typescript_1.default.isLiteralTypeNode(part) || !typescript_1.default.isStringLiteral(part.literal))
+            return null;
+        values.push(part.literal.text);
+    }
+    return values;
+}
+function collectFiniteBooleanLiteralsTypeNode(node) {
+    const values = [];
+    for (const part of node.types) {
+        if (!typescript_1.default.isLiteralTypeNode(part))
+            return null;
+        if (part.literal.kind === typescript_1.default.SyntaxKind.TrueKeyword) {
+            values.push(true);
+            continue;
+        }
+        if (part.literal.kind === typescript_1.default.SyntaxKind.FalseKeyword) {
+            values.push(false);
+            continue;
+        }
+        return null;
+    }
+    return values;
+}
+function collectFiniteNumberLiteralsTypeNode(node) {
+    const values = [];
+    for (const part of node.types) {
+        if (!typescript_1.default.isLiteralTypeNode(part) || !typescript_1.default.isNumericLiteral(part.literal))
+            return null;
+        values.push(Number(part.literal.text));
+    }
+    return values;
+}
+function finiteDomainSymbolForCpp(value) {
+    if (typeof value === "boolean")
+        return value ? "True" : "False";
+    if (typeof value === "number") {
+        const text = Number.isInteger(value) ? `${value}` : `${value}`.replace(/\./g, "_");
+        return sanitizeIdentifier(`Value_${text.replace(/-/g, "neg_")}`);
+    }
+    const direct = sanitizeIdentifier(value.trim());
+    return direct.length > 0 ? direct : "Value";
+}
+function buildCppFiniteDomain(primitive, values) {
+    const seen = new Set();
+    const variants = [];
+    for (const value of values) {
+        const key = `${typeof value}:${String(value)}`;
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        variants.push({
+            code: variants.length,
+            symbolicName: finiteDomainSymbolForCpp(value),
+            value
+        });
+    }
+    return { primitive, variants };
+}
+function collectFiniteDomainFromTypeNode(typeNode) {
+    if (typescript_1.default.isParenthesizedTypeNode(typeNode)) {
+        return collectFiniteDomainFromTypeNode(typeNode.type);
+    }
+    if (typescript_1.default.isLiteralTypeNode(typeNode)) {
+        if (typescript_1.default.isStringLiteral(typeNode.literal)) {
+            return buildCppFiniteDomain("string", [typeNode.literal.text]);
+        }
+        if (typescript_1.default.isNumericLiteral(typeNode.literal)) {
+            return buildCppFiniteDomain("number", [Number(typeNode.literal.text)]);
+        }
+        if (typeNode.literal.kind === typescript_1.default.SyntaxKind.TrueKeyword || typeNode.literal.kind === typescript_1.default.SyntaxKind.FalseKeyword) {
+            return buildCppFiniteDomain("boolean", [typeNode.literal.kind === typescript_1.default.SyntaxKind.TrueKeyword]);
+        }
+        return null;
+    }
+    if (!typescript_1.default.isUnionTypeNode(typeNode))
+        return null;
+    const filtered = filterNullishUnionTypeNodes(typeNode.types);
+    if (filtered.length !== typeNode.types.length)
+        return null;
+    const finiteStrings = collectFiniteStringLiteralsTypeNode(typeNode);
+    if (finiteStrings)
+        return buildCppFiniteDomain("string", finiteStrings);
+    const finiteBooleans = collectFiniteBooleanLiteralsTypeNode(typeNode);
+    if (finiteBooleans)
+        return buildCppFiniteDomain("boolean", finiteBooleans);
+    const finiteNumbers = collectFiniteNumberLiteralsTypeNode(typeNode);
+    if (finiteNumbers)
+        return buildCppFiniteDomain("number", finiteNumbers);
+    return null;
+}
 function mapTsTypeToCpp(typeText) {
     const raw = typeText.trim();
     if (/\bAnQst\.Type\.qint64\b/.test(raw))
@@ -179,6 +272,11 @@ function callbackName(memberName) {
 function pascalCase(value) {
     return value.length === 0 ? value : `${value.charAt(0).toUpperCase()}${value.slice(1)}`;
 }
+function sanitizeIdentifier(value) {
+    const trimmed = value.replace(/[^A-Za-z0-9_]+/g, "_").replace(/_+/g, "_").replace(/^_+|_+$/g, "");
+    const withFallback = trimmed.length > 0 ? trimmed : "Codec";
+    return /^[0-9]/.test(withFallback) ? `T_${withFallback}` : withFallback;
+}
 function variantToCppExpression(cppType, expr) {
     if (cppType === "QString")
         return `${expr}.toString()`;
@@ -471,6 +569,7 @@ class CppTypeNormalizer {
         this.allKnownNames = new Set();
         this.usedNames = new Set();
         this.syntheticNameByKey = new Map();
+        this.finiteDomainNameByKey = new Map();
         for (const decl of collectStructDecls(spec)) {
             this.allKnownNames.add(decl.name);
             this.usedNames.add(decl.name);
@@ -494,9 +593,11 @@ class CppTypeNormalizer {
         const order = this.topologicalOrder();
         const orderedDecls = order.map((name) => this.declMap.get(name)).filter((x) => !!x);
         const structNames = orderedDecls.filter((d) => d.kind === "struct").map((d) => d.name);
+        const metatypeNames = orderedDecls.filter((d) => d.kind === "struct" || d.kind === "enum").map((d) => d.name);
         return {
             orderedDecls,
             structNames,
+            metatypeNames,
             mapTypeText: (typeText, nameHintParts) => this.mapTypeText(typeText, nameHintParts)
         };
     }
@@ -514,7 +615,19 @@ class CppTypeNormalizer {
                     optional: !!member.questionToken
                 });
             }
-            return { name, kind: "struct", fields, aliasType: null, deps, isUnionAlias: false };
+            return { name, kind: "struct", fields, aliasType: null, deps, isUnionAlias: false, finiteDomain: null };
+        }
+        const finiteDomain = collectFiniteDomainFromTypeNode(node.type);
+        if (finiteDomain) {
+            return {
+                name,
+                kind: "enum",
+                fields: [],
+                aliasType: null,
+                deps: new Set(),
+                isUnionAlias: false,
+                finiteDomain
+            };
         }
         const deps = new Set();
         const aliasType = this.mapTypeNode(node.type, [name], deps);
@@ -524,13 +637,18 @@ class CppTypeNormalizer {
             fields: [],
             aliasType,
             deps,
-            isUnionAlias: node.type.getText().includes("|")
+            isUnionAlias: node.type.getText().includes("|"),
+            finiteDomain: null
         };
     }
     mapTypeNode(typeNode, nameHintParts, deps) {
         if (typescript_1.default.isParenthesizedTypeNode(typeNode)) {
             return this.mapTypeNode(typeNode.type, nameHintParts, deps);
         }
+        const finiteDomain = collectFiniteDomainFromTypeNode(typeNode);
+        if (finiteDomain) {
+            return this.ensureFiniteDomainType(finiteDomain, nameHintParts, deps);
+        }
         if (typescript_1.default.isUnionTypeNode(typeNode)) {
             const filtered = filterNullishUnionTypeNodes(typeNode.types);
             if (filtered.length === 1) {
@@ -587,6 +705,34 @@ class CppTypeNormalizer {
         this.collectKnownTypeDeps(mapped, deps);
         return mapped;
     }
+    ensureFiniteDomainType(domain, nameHintParts, deps) {
+        const baseName = this.makeSyntheticBaseName(nameHintParts);
+        const domainKey = `${baseName}::finite::${domain.primitive}::${domain.variants.map((variant) => `${variant.symbolicName}=${String(variant.value)}`).join("|")}`;
+        const existingName = this.finiteDomainNameByKey.get(domainKey);
+        if (existingName) {
+            deps.add(existingName);
+            return existingName;
+        }
+        const synthesizedName = this.allocateUniqueName(baseName);
+        this.finiteDomainNameByKey.set(domainKey, synthesizedName);
+        if (this.declMap.has(synthesizedName)) {
+            deps.add(synthesizedName);
+            return synthesizedName;
+        }
+        this.allKnownNames.add(synthesizedName);
+        this.declMap.set(synthesizedName, {
+            name: synthesizedName,
+            kind: "enum",
+            fields: [],
+            aliasType: null,
+            deps: new Set(),
+            isUnionAlias: false,
+            finiteDomain: domain
+        });
+        this.seedOrder.push(synthesizedName);
+        deps.add(synthesizedName);
+        return synthesizedName;
+    }
     ensureSyntheticStruct(typeNode, nameHintParts, deps) {
         const baseName = this.makeSyntheticBaseName(nameHintParts);
         const syntheticKey = `${baseName}::${typeNode.getText()}`;
@@ -620,7 +766,8 @@ class CppTypeNormalizer {
             fields,
             aliasType: null,
             deps: localDeps,
-            isUnionAlias: false
+            isUnionAlias: false,
+            finiteDomain: null
         });
         this.seedOrder.push(synthesizedName);
         deps.add(synthesizedName);
@@ -682,6 +829,17 @@ class CppTypeNormalizer {
     }
 }
 function renderCppDecl(decl) {
+    if (decl.kind === "enum") {
+        const variants = decl.finiteDomain?.variants ?? [];
+        const underlyingType = variants.length <= 0xff ? "std::uint8_t" : variants.length <= 0xffff ? "std::uint16_t" : "std::uint32_t";
+        const lines = [];
+        lines.push(`enum class ${decl.name} : ${underlyingType} {`);
+        for (const variant of variants) {
+            lines.push(`    ${variant.symbolicName} = ${variant.code},`);
+        }
+        lines.push("};");
+        return lines.join("\n");
+    }
     if (decl.kind === "alias") {
         if (decl.isUnionAlias && decl.aliasType === "QString") {
             return `using ${decl.name} = QString; // union mapped conservatively`;
@@ -737,6 +895,146 @@ function collectDragDropMimeConstants(spec) {
     }
     return constants;
 }
+function createCarrierSummary(counts, singleKinds = [], mayBlob = false, mustBlob = false) {
+    return {
+        counts: new Set(counts),
+        singleKinds: new Set(singleKinds),
+        mayBlob,
+        mustBlob
+    };
+}
+function addOptionalAbsence(summary) {
+    const counts = new Set(summary.counts);
+    counts.add(0);
+    return {
+        counts,
+        singleKinds: new Set(summary.singleKinds),
+        mayBlob: summary.mayBlob,
+        mustBlob: summary.mustBlob
+    };
+}
+function saturatingItemCountAdd(left, right) {
+    if (left === 2 || right === 2)
+        return 2;
+    const total = left + right;
+    return total >= 2 ? 2 : total;
+}
+function mergeCarrierSummaries(left, right) {
+    const counts = new Set();
+    const singleKinds = new Set();
+    for (const leftCount of left.counts) {
+        for (const rightCount of right.counts) {
+            const total = saturatingItemCountAdd(leftCount, rightCount);
+            counts.add(total);
+            if (total !== 1)
+                continue;
+            if (leftCount === 1 && rightCount === 0) {
+                for (const kind of left.singleKinds)
+                    singleKinds.add(kind);
+            }
+            if (leftCount === 0 && rightCount === 1) {
+                for (const kind of right.singleKinds)
+                    singleKinds.add(kind);
+            }
+        }
+    }
+    return {
+        counts,
+        singleKinds,
+        mayBlob: left.mayBlob || right.mayBlob,
+        mustBlob: left.mustBlob || right.mustBlob
+    };
+}
+function summarizePlanCarrier(node) {
+    switch (node.nodeKind) {
+        case "leaf":
+            if (node.blobEntryId)
+                return createCarrierSummary([0], [], true, true);
+            if (node.itemEntryId) {
+                return createCarrierSummary([1], [node.leaf.region === "dynamic" ? "object" : "string"]);
+            }
+            return createCarrierSummary([0]);
+        case "named":
+            return summarizePlanCarrier(node.target);
+        case "finite-domain":
+            if (node.blobEntryId)
+                return createCarrierSummary([0], [], true, true);
+            if (node.itemEntryId)
+                return createCarrierSummary([1], ["string"]);
+            return createCarrierSummary([0]);
+        case "array": {
+            if (node.extentStrategy === "blob-tail") {
+                return createCarrierSummary([0], [], true, false);
+            }
+            const elementSummary = summarizePlanCarrier(node.element);
+            const counts = new Set([0]);
+            const singleKinds = new Set();
+            if (elementSummary.counts.has(1)) {
+                counts.add(1);
+                for (const kind of elementSummary.singleKinds)
+                    singleKinds.add(kind);
+            }
+            if (elementSummary.counts.has(1) || elementSummary.counts.has(2)) {
+                counts.add(2);
+            }
+            return {
+                counts,
+                singleKinds,
+                mayBlob: true,
+                mustBlob: true
+            };
+        }
+        case "struct": {
+            let summary = createCarrierSummary([0]);
+            for (const field of node.fields) {
+                let fieldSummary = summarizePlanCarrier(field.node);
+                if (field.optional) {
+                    fieldSummary = addOptionalAbsence(fieldSummary);
+                }
+                if (field.presenceStrategy) {
+                    fieldSummary = {
+                        counts: new Set(fieldSummary.counts),
+                        singleKinds: new Set(fieldSummary.singleKinds),
+                        mayBlob: true,
+                        mustBlob: true
+                    };
+                }
+                summary = mergeCarrierSummaries(summary, fieldSummary);
+            }
+            return summary;
+        }
+    }
+}
+function inferDragDropCarrierKinds(plan) {
+    const summary = summarizePlanCarrier(plan.root);
+    const carriers = new Set();
+    const addNoBlobCarriers = () => {
+        if (summary.counts.has(0))
+            carriers.add("array");
+        if (summary.counts.has(1)) {
+            for (const kind of summary.singleKinds)
+                carriers.add(kind);
+        }
+        if (summary.counts.has(2))
+            carriers.add("array");
+    };
+    if (summary.mustBlob) {
+        if (summary.counts.has(0))
+            carriers.add("string");
+        if (summary.counts.has(1) || summary.counts.has(2))
+            carriers.add("array");
+    }
+    else {
+        addNoBlobCarriers();
+        if (summary.mayBlob) {
+            if (summary.counts.has(0))
+                carriers.add("string");
+            if (summary.counts.has(1) || summary.counts.has(2))
+                carriers.add("array");
+        }
+    }
+    return ["string", "array", "object"].filter((kind) => carriers.has(kind));
+}
 function collectDragDropPayloadHelpers(spec, cppTypes, cppCodecCatalog) {
     const seen = new Set();
     const helpers = [];
@@ -748,21 +1046,96 @@ function collectDragDropPayloadHelpers(spec, cppTypes, cppCodecCatalog) {
             if (seen.has(typeName))
                 continue;
             seen.add(typeName);
-            const payloadSite = (0, structured_top_level_codecs_1.getStructuredPayloadSite)(cppCodecCatalog, service.name, member.name);
+            const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(cppCodecCatalog, service.name, member.name);
             if (!payloadSite)
                 continue;
+            const plan = cppCodecCatalog.plansByCodecId.get(payloadSite.codecId);
+            if (!plan)
+                continue;
             helpers.push({
                 typeName,
                 cppType: cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]),
-                codecId: payloadSite.codecId
+                codecId: payloadSite.codecId,
+                carriers: inferDragDropCarrierKinds(plan)
             });
         }
     }
     return helpers;
 }
+function collectTsDragDropPayloadHelpers(spec, codecCatalog) {
+    const seen = new Set();
+    const helpers = [];
+    for (const service of spec.services) {
+        for (const member of service.members) {
+            if ((member.kind !== "DropTarget" && member.kind !== "HoverTarget") || !member.payloadTypeText)
+                continue;
+            const typeName = member.payloadTypeText.replace(/\s/g, "");
+            if (seen.has(typeName))
+                continue;
+            seen.add(typeName);
+            const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(codecCatalog, service.name, member.name);
+            if (!payloadSite)
+                continue;
+            const plan = codecCatalog.plansByCodecId.get(payloadSite.codecId);
+            if (!plan)
+                continue;
+            helpers.push({
+                typeName,
+                tsType: mapTypeTextToTs(member.payloadTypeText),
+                codecId: payloadSite.codecId,
+                carriers: inferDragDropCarrierKinds(plan)
+            });
+        }
+    }
+    return helpers;
+}
+function renderTsDragDropPayloadHelpers(spec, codecCatalog) {
+    const helpers = collectTsDragDropPayloadHelpers(spec, codecCatalog);
+    return helpers
+        .map((helper) => {
+        const lines = [
+            `function decodeDragDropPayload_${helper.typeName}(rawPayload: unknown): ${helper.tsType} {`,
+            `  if (typeof rawPayload !== "string") {`,
+            `    throw new Error("Drag/drop payload must be tagged text.");`,
+            `  }`,
+            `  if (rawPayload.length === 0) {`,
+            `    throw new Error("Drag/drop payload is empty.");`,
+            `  }`,
+            `  const transportTag = rawPayload[0];`,
+            `  const payloadText = rawPayload.slice(1);`
+        ];
+        if (helper.carriers.includes("string")) {
+            lines.push(`  if (transportTag === "S") {`);
+            lines.push(`    return decode${helper.codecId}(payloadText);`);
+            lines.push(`  }`);
+        }
+        if (helper.carriers.includes("array")) {
+            lines.push(`  if (transportTag === "A") {`);
+            lines.push(`    const parsed = JSON.parse(payloadText) as unknown;`);
+            lines.push(`    if (!Array.isArray(parsed)) {`);
+            lines.push(`      throw new Error("Drag/drop payload must be a JSON array.");`);
+            lines.push(`    }`);
+            lines.push(`    return decode${helper.codecId}(parsed);`);
+            lines.push(`  }`);
+        }
+        if (helper.carriers.includes("object")) {
+            lines.push(`  if (transportTag === "O") {`);
+            lines.push(`    const parsed = JSON.parse(payloadText) as unknown;`);
+            lines.push(`    if (parsed === null || Array.isArray(parsed) || typeof parsed !== "object") {`);
+            lines.push(`      throw new Error("Drag/drop payload must be a JSON object.");`);
+            lines.push(`    }`);
+            lines.push(`    return decode${helper.codecId}(parsed);`);
+            lines.push(`  }`);
+        }
+        lines.push(`  throw new Error(\`Drag/drop payload has an unknown transport tag: \${transportTag}\`);`);
+        lines.push(`}`);
+        return lines.join("\n");
+    })
+        .join("\n\n");
+}
 function renderTypesHeader(spec, cppTypes) {
     const decls = cppTypes.orderedDecls.map(renderCppDecl).join("\n\n");
-    const metatypes = cppTypes.structNames
+    const metatypes = cppTypes.metatypeNames
         .flatMap((name) => [
         `Q_DECLARE_METATYPE(${spec.widgetName}::${name})`,
         `Q_DECLARE_METATYPE(QList<${spec.widgetName}::${name}>)`
@@ -794,14 +1167,12 @@ ${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) {
+function renderWidgetHeader(spec, cppTypes, cppCodecCatalog) {
     const widgetClassName = `${spec.widgetName}Widget`;
-    const cppCodecCatalog = (0, structured_top_level_codecs_1.buildStructuredCodecCatalog)(spec);
     const dragDropPayloadHelpers = collectDragDropPayloadHelpers(spec, cppTypes, cppCodecCatalog);
     const callbackAliases = [];
     const publicMethods = [];
@@ -816,10 +1187,8 @@ function renderWidgetHeader(spec, cppTypes) {
         `static QByteArray encodeDragDropPayload_${helper.typeName}(const ${helper.cppType}& payload);`,
         `static std::optional<${helper.cppType}> decodeDragDropPayload_${helper.typeName}(const QByteArray& rawPayload);`
     ]);
-    const bindings = [];
     for (const service of spec.services) {
         for (const member of service.members) {
-            bindings.push({ service: service.name, member: member.name, kind: member.kind });
             const memberPascal = pascalCase(member.name);
             if (member.kind === "Call" && member.payloadTypeText) {
                 const cppType = cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]);
@@ -929,13 +1298,6 @@ private:
         QVariantList args;
         QDateTime enqueuedAt;
     };
-    struct BridgeBindingRow {
-        const char* service;
-        const char* member;
-        const char* kind;
-    };
-    static const BridgeBindingRow kBridgeBindings[];
-    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;
@@ -957,18 +1319,19 @@ ${fields.map((f) => `    ${f}`).join("\n")}
 };
 `;
 }
-function renderCppStub(spec, cppTypes) {
+function renderCppStub(spec, cppTypes, cppCodecCatalog) {
     const widgetClassName = `${spec.widgetName}Widget`;
-    const cppCodecCatalog = (0, structured_top_level_codecs_1.buildStructuredCodecCatalog)(spec);
     const dragDropPayloadHelpers = collectDragDropPayloadHelpers(spec, cppTypes, cppCodecCatalog);
-    const cppCodecHelpers = (0, structured_top_level_codecs_1.renderCppStructuredCodecHelpers)(cppCodecCatalog, (typeText, pathHintParts) => cppTypes.mapTypeText(typeText, pathHintParts)).trim();
+    const cppCodecHelpers = (0, boundary_codecs_1.renderCppBoundaryCodecHelpers)(cppCodecCatalog, (typeText, pathHintParts) => cppTypes.mapTypeText(typeText, pathHintParts)).trim();
     const lines = [];
     lines.push(`#include "include/${spec.widgetName}Widget.h"`);
+    lines.push(`#include "AnQstBase93.h"`);
     lines.push(`#include <QDebug>`);
     lines.push(`#include <QElapsedTimer>`);
     lines.push(`#include <QEventLoop>`);
     lines.push(`#include <QJsonArray>`);
     lines.push(`#include <QJsonDocument>`);
+    lines.push(`#include <QJsonObject>`);
     lines.push(`#include <QMetaType>`);
     lines.push(`#include <QTimer>`);
     lines.push(`#include <cstring>`);
@@ -984,7 +1347,7 @@ function renderCppStub(spec, cppTypes) {
     lines.push("namespace {");
     lines.push("void registerGeneratedMetaTypes() {");
     lines.push("    static const bool registered = []() {");
-    for (const typeName of cppTypes.structNames) {
+    for (const typeName of cppTypes.metatypeNames) {
         lines.push(`        qRegisterMetaType<${spec.widgetName}::${typeName}>("${spec.widgetName}::${typeName}");`);
         lines.push(`        qRegisterMetaType<QList<${spec.widgetName}::${typeName}>>("QList<${spec.widgetName}::${typeName}>");`);
     }
@@ -1000,20 +1363,78 @@ function renderCppStub(spec, cppTypes) {
     lines.push("");
     for (const helper of dragDropPayloadHelpers) {
         lines.push(`QByteArray ${widgetClassName}::encodeDragDropPayload_${helper.typeName}(const ${helper.cppType}& payload) {`);
-        lines.push(`    return QJsonDocument::fromVariant(anqstNormalizeWireItems(encode${helper.codecId}(payload))).toJson(QJsonDocument::Compact);`);
+        lines.push(`    const QVariant wire = encode${helper.codecId}(payload);`);
+        if (helper.carriers.includes("string")) {
+            lines.push(`    if (wire.type() == QVariant::String) {`);
+            lines.push(`        QByteArray out;`);
+            lines.push(`        out.append('S');`);
+            lines.push(`        out.append(wire.toString().toUtf8());`);
+            lines.push(`        return out;`);
+            lines.push(`    }`);
+        }
+        if (helper.carriers.includes("array")) {
+            lines.push(`    if (wire.type() == QVariant::List) {`);
+            lines.push(`        QByteArray out;`);
+            lines.push(`        out.append('A');`);
+            lines.push(`        out.append(QJsonDocument(QJsonArray::fromVariantList(wire.toList())).toJson(QJsonDocument::Compact));`);
+            lines.push(`        return out;`);
+            lines.push(`    }`);
+        }
+        if (helper.carriers.includes("object")) {
+            lines.push(`    if (wire.type() == QVariant::Map) {`);
+            lines.push(`        QByteArray out;`);
+            lines.push(`        out.append('O');`);
+            lines.push(`        out.append(QJsonDocument(QJsonObject::fromVariantMap(wire.toMap())).toJson(QJsonDocument::Compact));`);
+            lines.push(`        return out;`);
+            lines.push(`    }`);
+        }
+        lines.push(`    throw std::runtime_error("AnQst drag/drop payload codec emitted an unsupported top-level carrier.");`);
         lines.push(`}`);
         lines.push("");
         lines.push(`std::optional<${helper.cppType}> ${widgetClassName}::decodeDragDropPayload_${helper.typeName}(const QByteArray& rawPayload) {`);
-        lines.push(`    QJsonParseError parseError;`);
-        lines.push(`    const QJsonDocument document = QJsonDocument::fromJson(rawPayload, &parseError);`);
-        lines.push(`    if (parseError.error != QJsonParseError::NoError || !document.isArray()) {`);
-        lines.push(`        return std::nullopt;`);
-        lines.push(`    }`);
-        lines.push(`    try {`);
-        lines.push(`        return decode${helper.codecId}(document.array().toVariantList());`);
-        lines.push(`    } catch (...) {`);
+        lines.push(`    if (rawPayload.isEmpty()) {`);
         lines.push(`        return std::nullopt;`);
         lines.push(`    }`);
+        lines.push(`    const char transportTag = rawPayload.at(0);`);
+        lines.push(`    const QByteArray payloadBytes = rawPayload.mid(1);`);
+        if (helper.carriers.includes("string")) {
+            lines.push(`    if (transportTag == 'S') {`);
+            lines.push(`        try {`);
+            lines.push(`            return decode${helper.codecId}(QString::fromUtf8(payloadBytes));`);
+            lines.push(`        } catch (...) {`);
+            lines.push(`            return std::nullopt;`);
+            lines.push(`        }`);
+            lines.push(`    }`);
+        }
+        if (helper.carriers.includes("array")) {
+            lines.push(`    if (transportTag == 'A') {`);
+            lines.push(`        QJsonParseError parseError;`);
+            lines.push(`        const QJsonDocument document = QJsonDocument::fromJson(payloadBytes, &parseError);`);
+            lines.push(`        if (parseError.error != QJsonParseError::NoError || !document.isArray()) {`);
+            lines.push(`            return std::nullopt;`);
+            lines.push(`        }`);
+            lines.push(`        try {`);
+            lines.push(`            return decode${helper.codecId}(QVariant(document.array().toVariantList()));`);
+            lines.push(`        } catch (...) {`);
+            lines.push(`            return std::nullopt;`);
+            lines.push(`        }`);
+            lines.push(`    }`);
+        }
+        if (helper.carriers.includes("object")) {
+            lines.push(`    if (transportTag == 'O') {`);
+            lines.push(`        QJsonParseError parseError;`);
+            lines.push(`        const QJsonDocument document = QJsonDocument::fromJson(payloadBytes, &parseError);`);
+            lines.push(`        if (parseError.error != QJsonParseError::NoError || !document.isObject()) {`);
+            lines.push(`            return std::nullopt;`);
+            lines.push(`        }`);
+            lines.push(`        try {`);
+            lines.push(`            return decode${helper.codecId}(QVariant(document.object().toVariantMap()));`);
+            lines.push(`        } catch (...) {`);
+            lines.push(`            return std::nullopt;`);
+            lines.push(`        }`);
+            lines.push(`    }`);
+        }
+        lines.push(`    return std::nullopt;`);
         lines.push(`}`);
         lines.push("");
     }
@@ -1033,14 +1454,6 @@ function renderCppStub(spec, cppTypes) {
             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}"},`);
-        }
-    }
-    lines.push(`};`);
-    lines.push("");
     lines.push(`${widgetClassName}::${widgetClassName}(QWidget* parent) : AnQstWebHostBase(parent), handle(this) {`);
     lines.push(`    static const bool kResourcesInitialized = []() {`);
     lines.push(`        ::qInitResources_${spec.widgetName}();`);
@@ -1067,19 +1480,89 @@ function renderCppStub(spec, cppTypes) {
         for (const member of service.members) {
             if (member.kind === "DropTarget" && member.payloadTypeText) {
                 const cppType = cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]);
-                const payloadSite = (0, structured_top_level_codecs_1.getStructuredPayloadSite)(cppCodecCatalog, service.name, member.name);
+                const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(cppCodecCatalog, service.name, member.name);
+                const typeName = member.payloadTypeText.replace(/\s/g, "");
                 lines.push(`    QObject::connect(this, &AnQstWebHostBase::anQstBridge_dropReceived, this, [this](const QString& service, const QString& member, const QVariant& payload, double x, double y) {`);
                 lines.push(`        if (service == QStringLiteral("${service.name}") && member == QStringLiteral("${member.name}")) {`);
-                lines.push(`            emit ${member.name}(${payloadSite ? `decode${payloadSite.codecId}(payload)` : `payload.value<${cppType}>()`}, x, y);`);
+                if (payloadSite) {
+                    lines.push(`            if (payload.type() != QVariant::String) {`);
+                    lines.push(`                emitHostError(`);
+                    lines.push(`                    QStringLiteral("DeserializationError"),`);
+                    lines.push(`                    QStringLiteral("bridge"),`);
+                    lines.push(`                    QStringLiteral("error"),`);
+                    lines.push(`                    true,`);
+                    lines.push(`                    QStringLiteral("Failed to deserialize DropTarget ${service.name}.${member.name}."),`);
+                    lines.push(`                    {`);
+                    lines.push(`                        {QStringLiteral("service"), QStringLiteral("${service.name}")},`);
+                    lines.push(`                        {QStringLiteral("member"), QStringLiteral("${member.name}")},`);
+                    lines.push(`                        {QStringLiteral("detail"), QStringLiteral("Host did not provide tagged drag/drop payload text.")},`);
+                    lines.push(`                    });`);
+                    lines.push(`                return;`);
+                    lines.push(`            }`);
+                    lines.push(`            const auto decodedPayload = decodeDragDropPayload_${typeName}(payload.toString().toUtf8());`);
+                    lines.push(`            if (!decodedPayload.has_value()) {`);
+                    lines.push(`                emitHostError(`);
+                    lines.push(`                    QStringLiteral("DeserializationError"),`);
+                    lines.push(`                    QStringLiteral("bridge"),`);
+                    lines.push(`                    QStringLiteral("error"),`);
+                    lines.push(`                    true,`);
+                    lines.push(`                    QStringLiteral("Failed to deserialize DropTarget ${service.name}.${member.name}."),`);
+                    lines.push(`                    {`);
+                    lines.push(`                        {QStringLiteral("service"), QStringLiteral("${service.name}")},`);
+                    lines.push(`                        {QStringLiteral("member"), QStringLiteral("${member.name}")},`);
+                    lines.push(`                        {QStringLiteral("detail"), QStringLiteral("Tagged drag/drop payload did not match the planned boundary carrier.")},`);
+                    lines.push(`                    });`);
+                    lines.push(`                return;`);
+                    lines.push(`            }`);
+                    lines.push(`            emit ${member.name}(*decodedPayload, x, y);`);
+                }
+                else {
+                    lines.push(`            emit ${member.name}(payload.value<${cppType}>(), x, y);`);
+                }
                 lines.push(`        }`);
                 lines.push(`    });`);
             }
             else if (member.kind === "HoverTarget" && member.payloadTypeText) {
                 const cppType = cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]);
-                const payloadSite = (0, structured_top_level_codecs_1.getStructuredPayloadSite)(cppCodecCatalog, service.name, member.name);
+                const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(cppCodecCatalog, service.name, member.name);
+                const typeName = member.payloadTypeText.replace(/\s/g, "");
                 lines.push(`    QObject::connect(this, &AnQstWebHostBase::anQstBridge_hoverUpdated, this, [this](const QString& service, const QString& member, const QVariant& payload, double x, double y) {`);
                 lines.push(`        if (service == QStringLiteral("${service.name}") && member == QStringLiteral("${member.name}")) {`);
-                lines.push(`            emit ${member.name}(${payloadSite ? `decode${payloadSite.codecId}(payload)` : `payload.value<${cppType}>()`}, x, y);`);
+                if (payloadSite) {
+                    lines.push(`            if (payload.type() != QVariant::String) {`);
+                    lines.push(`                emitHostError(`);
+                    lines.push(`                    QStringLiteral("DeserializationError"),`);
+                    lines.push(`                    QStringLiteral("bridge"),`);
+                    lines.push(`                    QStringLiteral("error"),`);
+                    lines.push(`                    true,`);
+                    lines.push(`                    QStringLiteral("Failed to deserialize HoverTarget ${service.name}.${member.name}."),`);
+                    lines.push(`                    {`);
+                    lines.push(`                        {QStringLiteral("service"), QStringLiteral("${service.name}")},`);
+                    lines.push(`                        {QStringLiteral("member"), QStringLiteral("${member.name}")},`);
+                    lines.push(`                        {QStringLiteral("detail"), QStringLiteral("Host did not provide tagged drag/drop payload text.")},`);
+                    lines.push(`                    });`);
+                    lines.push(`                return;`);
+                    lines.push(`            }`);
+                    lines.push(`            const auto decodedPayload = decodeDragDropPayload_${typeName}(payload.toString().toUtf8());`);
+                    lines.push(`            if (!decodedPayload.has_value()) {`);
+                    lines.push(`                emitHostError(`);
+                    lines.push(`                    QStringLiteral("DeserializationError"),`);
+                    lines.push(`                    QStringLiteral("bridge"),`);
+                    lines.push(`                    QStringLiteral("error"),`);
+                    lines.push(`                    true,`);
+                    lines.push(`                    QStringLiteral("Failed to deserialize HoverTarget ${service.name}.${member.name}."),`);
+                    lines.push(`                    {`);
+                    lines.push(`                        {QStringLiteral("service"), QStringLiteral("${service.name}")},`);
+                    lines.push(`                        {QStringLiteral("member"), QStringLiteral("${member.name}")},`);
+                    lines.push(`                        {QStringLiteral("detail"), QStringLiteral("Tagged drag/drop payload did not match the planned boundary carrier.")},`);
+                    lines.push(`                    });`);
+                    lines.push(`                return;`);
+                    lines.push(`            }`);
+                    lines.push(`            emit ${member.name}(*decodedPayload, x, y);`);
+                }
+                else {
+                    lines.push(`            emit ${member.name}(payload.value<${cppType}>(), x, y);`);
+                }
                 lines.push(`        }`);
                 lines.push(`    });`);
                 lines.push(`    QObject::connect(this, &AnQstWebHostBase::anQstBridge_hoverLeft, this, [this](const QString& service, const QString& member) {`);
@@ -1185,12 +1668,12 @@ function renderCppStub(spec, cppTypes) {
                 continue;
             const timeoutMs = member.timeoutMs;
             const cppType = cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]);
-            const payloadSite = (0, structured_top_level_codecs_1.getStructuredPayloadSite)(cppCodecCatalog, service.name, member.name);
+            const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(cppCodecCatalog, service.name, member.name);
             lines.push(`    if (service == QStringLiteral("${service.name}") && member == QStringLiteral("${member.name}")) {`);
             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]);
-                const paramSite = (0, structured_top_level_codecs_1.getStructuredParameterSite)(cppCodecCatalog, service.name, member.name, p.name);
+                const paramSite = (0, boundary_codecs_1.getBoundaryParameterSite)(cppCodecCatalog, service.name, member.name, p.name);
                 lines.push(`        const ${pType} ${p.name} = ${paramSite ? `decode${paramSite.codecId}(args.value(${i}))` : variantToCppExpression(pType, `args.value(${i})`)};`);
             }
             lines.push(`        const QString requestId = QStringLiteral("call-%1").arg(++m_callRequestCounter);`);
@@ -1260,7 +1743,7 @@ function renderCppStub(spec, cppTypes) {
             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]);
-                const paramSite = (0, structured_top_level_codecs_1.getStructuredParameterSite)(cppCodecCatalog, service.name, member.name, p.name);
+                const paramSite = (0, boundary_codecs_1.getBoundaryParameterSite)(cppCodecCatalog, service.name, member.name, p.name);
                 lines.push(`        const ${pType} ${p.name} = ${paramSite ? `decode${paramSite.codecId}(args.value(${i}))` : variantToCppExpression(pType, `args.value(${i})`)};`);
             }
             const argNames = member.parameters.map((p) => p.name).join(", ");
@@ -1277,7 +1760,7 @@ function renderCppStub(spec, cppTypes) {
             if (member.kind !== "Input" || !member.payloadTypeText)
                 continue;
             const cppType = cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]);
-            const payloadSite = (0, structured_top_level_codecs_1.getStructuredPayloadSite)(cppCodecCatalog, service.name, member.name);
+            const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(cppCodecCatalog, service.name, member.name);
             lines.push(`    if (service == QStringLiteral("${service.name}") && member == QStringLiteral("${member.name}")) {`);
             lines.push(`        const ${cppType} typedValue = ${payloadSite ? `decode${payloadSite.codecId}(value)` : variantToCppExpression(cppType, "value")};`);
             lines.push(`        set${pascalCase(member.name)}(typedValue);`);
@@ -1299,13 +1782,13 @@ function renderCppStub(spec, cppTypes) {
             }
             if (member.kind === "Slot") {
                 const ret = member.payloadTypeText ? cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]) : "void";
-                const payloadSite = member.payloadTypeText ? (0, structured_top_level_codecs_1.getStructuredPayloadSite)(cppCodecCatalog, service.name, member.name) : undefined;
+                const payloadSite = member.payloadTypeText ? (0, boundary_codecs_1.getBoundaryPayloadSite)(cppCodecCatalog, service.name, member.name) : undefined;
                 const args = member.parameters.map((p) => `${cppTypes.mapTypeText(p.typeText, [service.name, member.name, p.name])} ${p.name}`).join(", ");
                 lines.push(`${ret} ${widgetClassName}::slot_${member.name}(${args}) {`);
                 lines.push(`    QVariantList invokeArgs;`);
                 for (const p of member.parameters) {
                     const pType = mapTsTypeToCpp(p.typeText);
-                    const paramSite = (0, structured_top_level_codecs_1.getStructuredParameterSite)(cppCodecCatalog, service.name, member.name, p.name);
+                    const paramSite = (0, boundary_codecs_1.getBoundaryParameterSite)(cppCodecCatalog, service.name, member.name, p.name);
                     lines.push(`    invokeArgs.push_back(${paramSite ? `encode${paramSite.codecId}(${p.name})` : cppToVariantExpression(pType, p.name)});`);
                 }
                 lines.push(`    QVariant result;`);
@@ -1330,7 +1813,7 @@ 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 payloadSite = (0, structured_top_level_codecs_1.getStructuredPayloadSite)(cppCodecCatalog, service.name, member.name);
+                const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(cppCodecCatalog, service.name, member.name);
                 const cap = member.name.charAt(0).toUpperCase() + member.name.slice(1);
                 lines.push(`${cppType} ${widgetClassName}::${member.name}() const {`);
                 lines.push(`    return m_${member.name};`);
@@ -1567,11 +2050,11 @@ function renderTsService(spec, serviceName, codecCatalog) {
     const constructorBodyLines = [];
     for (const m of members) {
         const args = m.parameters.map((p) => `${p.name}: ${mapTypeTextToTs(p.typeText)}`).join(", ");
-        const paramSites = m.parameters.map((p) => (0, structured_top_level_codecs_1.getStructuredParameterSite)(codecCatalog, serviceName, m.name, p.name));
+        const paramSites = m.parameters.map((p) => (0, boundary_codecs_1.getBoundaryParameterSite)(codecCatalog, serviceName, m.name, p.name));
         const encodedValueArray = paramSites.length > 0
             ? `[${m.parameters.map((p, index) => `${paramSites[index] ? `encode${paramSites[index].codecId}(${p.name})` : p.name}`).join(", ")}]`
             : "[]";
-        const payloadSite = (0, structured_top_level_codecs_1.getStructuredPayloadSite)(codecCatalog, serviceName, m.name);
+        const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(codecCatalog, serviceName, m.name);
         if (m.kind === "Call") {
             const ret = mapTypeTextToTs(m.payloadTypeText ?? "void");
             if (payloadSite) {
@@ -1649,30 +2132,18 @@ function renderTsService(spec, serviceName, codecCatalog) {
             }
             if (m.kind === "Output") {
                 constructorBodyLines.push(`    this._bridge.onOutput("${serviceName}", "${m.name}", (value) => {`);
-                constructorBodyLines.push(`      try {`);
-                constructorBodyLines.push(`        this._${m.name}.set(${payloadSite ? `decode${payloadSite.codecId}(value)` : `value as ${tsType}`});`);
-                constructorBodyLines.push(`      } catch (error) {`);
-                constructorBodyLines.push(`        this._bridge.reportFrontendDiagnostic({`);
-                constructorBodyLines.push(`          code: "DeserializationError",`);
-                constructorBodyLines.push(`          severity: "error",`);
-                constructorBodyLines.push(`          category: "bridge",`);
-                constructorBodyLines.push(`          recoverable: true,`);
-                constructorBodyLines.push(`          message: \`Failed to deserialize Output ${serviceName}.${m.name}: \${errorMessage(error)}\`,`);
-                constructorBodyLines.push(`          service: "${serviceName}",`);
-                constructorBodyLines.push(`          member: "${m.name}",`);
-                constructorBodyLines.push(`          context: { interaction: "Output" }`);
-                constructorBodyLines.push(`        });`);
-                constructorBodyLines.push(`      }`);
+                constructorBodyLines.push(`      this._${m.name}.set(${payloadSite ? `decode${payloadSite.codecId}(value)` : `value as ${tsType}`});`);
                 constructorBodyLines.push(`    });`);
             }
         }
         if (m.kind === "DropTarget" && m.payloadTypeText) {
             const tsType = mapTypeTextToTs(m.payloadTypeText);
+            const typeName = m.payloadTypeText.replace(/\s/g, "");
             fieldLines.push(`  private readonly _${m.name} = signal<{ payload: ${tsType}; x: number; y: number } | null>(null);`);
             methodLines.push(`  ${m.name}(): { payload: ${tsType}; x: number; y: number } | null { return this._${m.name}(); }`);
             constructorBodyLines.push(`    this._bridge.onDrop("${serviceName}", "${m.name}", (payload, x, y) => {`);
             constructorBodyLines.push(`      try {`);
-            constructorBodyLines.push(`        this._${m.name}.set({ payload: ${payloadSite ? `decode${payloadSite.codecId}(payload)` : `payload as ${tsType}`}, x, y });`);
+            constructorBodyLines.push(`        this._${m.name}.set({ payload: ${payloadSite ? `decodeDragDropPayload_${typeName}(payload)` : `payload as ${tsType}`}, x, y });`);
             constructorBodyLines.push(`      } catch (error) {`);
             constructorBodyLines.push(`        this._bridge.reportFrontendDiagnostic({`);
             constructorBodyLines.push(`          code: "DeserializationError",`);
@@ -1689,11 +2160,12 @@ function renderTsService(spec, serviceName, codecCatalog) {
         }
         if (m.kind === "HoverTarget" && m.payloadTypeText) {
             const tsType = mapTypeTextToTs(m.payloadTypeText);
+            const typeName = m.payloadTypeText.replace(/\s/g, "");
             fieldLines.push(`  private readonly _${m.name} = signal<{ payload: ${tsType}; x: number; y: number } | null>(null);`);
             methodLines.push(`  ${m.name}(): { payload: ${tsType}; x: number; y: number } | null { return this._${m.name}(); }`);
             constructorBodyLines.push(`    this._bridge.onHover("${serviceName}", "${m.name}", (payload, x, y) => {`);
             constructorBodyLines.push(`      try {`);
-            constructorBodyLines.push(`        this._${m.name}.set({ payload: ${payloadSite ? `decode${payloadSite.codecId}(payload)` : `payload as ${tsType}`}, x, y });`);
+            constructorBodyLines.push(`        this._${m.name}.set({ payload: ${payloadSite ? `decodeDragDropPayload_${typeName}(payload)` : `payload as ${tsType}`}, x, y });`);
             constructorBodyLines.push(`      } catch (error) {`);
             constructorBodyLines.push(`        this._bridge.reportFrontendDiagnostic({`);
             constructorBodyLines.push(`          code: "DeserializationError",`);
@@ -1785,18 +2257,20 @@ export declare class ${serviceName} {
   readonly onSlot: ${onSlotInterfaceName};${classMemberBlock}
 }`;
 }
-function renderTsServices(spec) {
-    const codecCatalog = (0, structured_top_level_codecs_1.buildStructuredCodecCatalog)(spec);
+function renderTsServices(spec, codecCatalog) {
     const serviceClasses = spec.services.map((s) => renderTsService(spec, s.name, codecCatalog)).join("\n");
     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` : "";
+    const dragDropHelperBlock = renderTsDragDropPayloadHelpers(spec, codecCatalog).trim();
+    const dragDropHelpers = dragDropHelperBlock.length > 0 ? `\n// Drag/drop payload helpers\n${dragDropHelperBlock}\n` : "";
     return `import { Injectable, inject, signal } from "@angular/core";
 ${typeImportsBlock}
 
-// Structured/top-level codec helpers
-${(0, structured_top_level_codecs_1.renderTsStructuredCodecHelpers)(codecCatalog)}
+// Boundary codec plan helpers
+${(0, boundary_codecs_1.renderTsBoundaryCodecHelpers)(codecCatalog)}
+${dragDropHelpers}
 
 type SlotHandler = (...args: unknown[]) => unknown;
 type OutputHandler = (value: unknown) => void;
@@ -2717,8 +3191,7 @@ function renderNodeExpressWsTypes(spec) {
     const sections = [typeImports, typeDecls].filter((s) => s.length > 0);
     return sections.length > 0 ? `${sections.join("\n\n")}\n` : "";
 }
-function renderNodeExpressWsIndex(spec) {
-    const codecCatalog = (0, structured_top_level_codecs_1.buildStructuredCodecCatalog)(spec);
+function renderNodeExpressWsIndex(spec, codecCatalog) {
     const typeImports = renderRequiredTypeImports(spec, `backend/node/express/${generatedNodeExpressWsDirName(spec.widgetName)}/index.ts`);
     const typeDecls = renderTypeDeclarations(spec, true);
     const handlerBridgeTypeName = `${spec.widgetName}HandlerBridge`;
@@ -2750,8 +3223,8 @@ function renderNodeExpressWsIndex(spec) {
         .map((member) => {
         const ret = mapTypeTextToTs(member.payloadTypeText ?? "void");
         const args = nodeParamArgs(member);
-        const paramSites = member.parameters.map((p) => (0, structured_top_level_codecs_1.getStructuredParameterSite)(codecCatalog, service.name, member.name, p.name));
-        const payloadSite = (0, structured_top_level_codecs_1.getStructuredPayloadSite)(codecCatalog, service.name, member.name);
+        const paramSites = member.parameters.map((p) => (0, boundary_codecs_1.getBoundaryParameterSite)(codecCatalog, service.name, member.name, p.name));
+        const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(codecCatalog, service.name, member.name);
         const encodedArgs = member.parameters.length > 0
             ? `[${member.parameters.map((p, index) => `${paramSites[index] ? `encode${paramSites[index].codecId}(${p.name})` : p.name}`).join(", ")}]`
             : "[]";
@@ -2765,7 +3238,7 @@ function renderNodeExpressWsIndex(spec) {
         .filter((member) => member.kind === "Output" && member.payloadTypeText)
         .map((member) => {
         const typeText = mapTypeTextToTs(member.payloadTypeText);
-        const payloadSite = (0, structured_top_level_codecs_1.getStructuredPayloadSite)(codecCatalog, service.name, member.name);
+        const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(codecCatalog, service.name, member.name);
         return `  set${service.name}_${nodeCap(member.name)}(value: ${typeText}): void {
     this.setOutputValue("${service.name}", "${member.name}", ${payloadSite ? `encode${payloadSite.codecId}(value)` : "value"});
   }`;
@@ -2820,7 +3293,7 @@ function renderNodeExpressWsIndex(spec) {
             .filter((member) => (member.kind === "Input" || member.kind === "Output") && member.payloadTypeText)
             .map((member) => {
             const typeText = mapTypeTextToTs(member.payloadTypeText);
-            const payloadSite = (0, structured_top_level_codecs_1.getStructuredPayloadSite)(codecCatalog, service.name, member.name);
+            const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(codecCatalog, service.name, member.name);
             if (member.kind === "Input") {
                 return `            ${member.name}: {\n              get: () => session.readInput("${service.name}", "${member.name}").then((value) => ${payloadSite ? `decode${payloadSite.codecId}(value)` : `value as ${typeText}`}),\n              on: (handler: (value: ${typeText}) => void) => session.onInput("${service.name}", "${member.name}", (value) => handler(${payloadSite ? `decode${payloadSite.codecId}(value)` : `value as ${typeText}`}))\n            },`;
             }
@@ -2834,8 +3307,8 @@ function renderNodeExpressWsIndex(spec) {
         .flatMap((service) => service.members
         .filter((member) => member.kind === "Call" && member.payloadTypeText)
         .map((member) => {
-        const paramSites = member.parameters.map((p) => (0, structured_top_level_codecs_1.getStructuredParameterSite)(codecCatalog, service.name, member.name, p.name));
-        const payloadSite = (0, structured_top_level_codecs_1.getStructuredPayloadSite)(codecCatalog, service.name, member.name);
+        const paramSites = member.parameters.map((p) => (0, boundary_codecs_1.getBoundaryParameterSite)(codecCatalog, service.name, member.name, p.name));
+        const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(codecCatalog, service.name, member.name);
         const decodedArgs = member.parameters.length > 0
             ? member.parameters.map((p, index) => `${paramSites[index] ? `decode${paramSites[index].codecId}(args[${index}])` : `args[${index}] as ${mapTypeTextToTs(p.typeText)}`}`).join(", ")
             : "";
@@ -2890,7 +3363,7 @@ function renderNodeExpressWsIndex(spec) {
         .flatMap((service) => service.members
         .filter((member) => member.kind === "Emitter")
         .map((member) => {
-        const paramSites = member.parameters.map((p) => (0, structured_top_level_codecs_1.getStructuredParameterSite)(codecCatalog, service.name, member.name, p.name));
+        const paramSites = member.parameters.map((p) => (0, boundary_codecs_1.getBoundaryParameterSite)(codecCatalog, service.name, member.name, p.name));
         const decodedArgs = member.parameters.length > 0
             ? member.parameters.map((p, index) => `${paramSites[index] ? `decode${paramSites[index].codecId}(args[${index}])` : `args[${index}] as ${mapTypeTextToTs(p.typeText)}`}`).join(", ")
             : "";
@@ -2935,7 +3408,7 @@ function renderNodeExpressWsIndex(spec) {
         .flatMap((service) => service.members
         .filter((member) => member.kind === "Input" && member.payloadTypeText)
         .map((member) => {
-        const payloadSite = (0, structured_top_level_codecs_1.getStructuredPayloadSite)(codecCatalog, service.name, member.name);
+        const payloadSite = (0, boundary_codecs_1.getBoundaryPayloadSite)(codecCatalog, service.name, member.name);
         return `    if (service === "${service.name}" && member === "${member.name}") {
       const handler = implementation.${service.name}.${member.name};
       if (typeof handler !== "function") {
@@ -2976,8 +3449,8 @@ import type { WebSocket, WebSocketServer } from "ws";
 ${typeImports}
 ${typeDecls}
 
-// Structured/top-level codec helpers
-${(0, structured_top_level_codecs_1.renderTsStructuredCodecHelpers)(codecCatalog)}
+// Boundary codec plan helpers
+${(0, boundary_codecs_1.renderTsBoundaryCodecHelpers)(codecCatalog)}
 
 ${handlerInterfaces}
 
@@ -3439,7 +3912,23 @@ function renderTypeRootIndexDts(spec) {
     const typeDecls = renderTypeTypesDts(spec).trim();
     const serviceDecls = renderTypeServicesDts(spec).trim();
     const sections = [indexDecls, typeDecls, serviceDecls].filter((s) => s.length > 0);
-    return sections.length > 0 ? `${sections.join("\n\n")}\n` : "";
+    if (sections.length === 0)
+        return "";
+    const dedupedLines = [];
+    const seenImportLines = new Set();
+    for (const line of sections.join("\n\n").split("\n")) {
+        const trimmed = line.trim();
+        if (!trimmed.startsWith("import type ")) {
+            dedupedLines.push(line);
+            continue;
+        }
+        if (seenImportLines.has(trimmed))
+            continue;
+        seenImportLines.add(trimmed);
+        dedupedLines.push(line);
+    }
+    const deduped = dedupedLines.join("\n").replace(/\n{3,}/g, "\n\n");
+    return `${deduped}\n`;
 }
 function generatedCppLibraryDirName(widgetName) {
     return (0, layout_1.generatedQtWidgetDirName)(widgetName);
@@ -3452,10 +3941,11 @@ function generateOutputs(spec, options = { emitQWidget: true, emitAngularService
     const cppDir = `backend/cpp/qt/${generatedCppLibraryDirName(spec.widgetName)}`;
     const nodeDir = `backend/node/express/${generatedNodeExpressWsDirName(spec.widgetName)}`;
     const outputs = {};
+    const codecCatalog = (0, boundary_codecs_1.buildBoundaryCodecCatalog)(spec);
     if (options.emitAngularService) {
         outputs[`${frontendDir}/package.json`] = renderNpmPackage(spec);
         outputs[`${frontendDir}/index.ts`] = renderTsIndex();
-        outputs[`${frontendDir}/services.ts`] = renderTsServices(spec);
+        outputs[`${frontendDir}/services.ts`] = renderTsServices(spec, codecCatalog);
         outputs[`${frontendDir}/types.ts`] = renderTsTypes(spec);
         outputs[`${frontendDir}/index.js`] = renderJsIndex();
         outputs[`${frontendDir}/services.js`] = renderJsServices();
@@ -3469,13 +3959,13 @@ function generateOutputs(spec, options = { emitQWidget: true, emitAngularService
         outputs[`${cppDir}/CMakeLists.txt`] = renderCMake(spec);
         outputs[`${cppDir}/${spec.widgetName}.qrc`] = renderEmbeddedQrc(spec.widgetName, []);
         outputs[`${cppDir}/include/${spec.widgetName}.h`] = renderWidgetUmbrellaHeader(spec);
-        outputs[`${cppDir}/include/${spec.widgetName}Widget.h`] = renderWidgetHeader(spec, cppTypes);
+        outputs[`${cppDir}/include/${spec.widgetName}Widget.h`] = renderWidgetHeader(spec, cppTypes, codecCatalog);
         outputs[`${cppDir}/include/${spec.widgetName}Types.h`] = renderTypesHeader(spec, cppTypes);
-        outputs[`${cppDir}/${spec.widgetName}.cpp`] = renderCppStub(spec, cppTypes);
+        outputs[`${cppDir}/${spec.widgetName}.cpp`] = renderCppStub(spec, cppTypes, codecCatalog);
     }
     if (options.emitNodeExpressWs) {
         outputs[`${nodeDir}/package.json`] = renderNodeExpressWsPackage(spec);
-        outputs[`${nodeDir}/index.ts`] = renderNodeExpressWsIndex(spec);
+        outputs[`${nodeDir}/index.ts`] = renderNodeExpressWsIndex(spec, codecCatalog);
         outputs[`${nodeDir}/types/index.d.ts`] = renderNodeExpressWsTypes(spec);
     }
     return outputs;