@dusted/anqst 1.7.1 → 1.7.3

package/dist/src/abi-hash-stamp.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ANQST_WEBBASE_ABI_HASH_STAMP = void 0;
+// Generated by scripts/build-with-stamp.js. Do not edit by hand.
+exports.ANQST_WEBBASE_ABI_HASH_STAMP = "_da43ea0d526e8ac0a869ccc79976519d2566b40d8b97a12bddfa2aaaac5304f6";

package/dist/src/abi-hash.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveAnQstWebBaseAbiHashStamp = resolveAnQstWebBaseAbiHashStamp;
+exports.anqstWebBaseTargetName = anqstWebBaseTargetName;
+exports.anqstWebBaseNamespaceName = anqstWebBaseNamespaceName;
+const abi_hash_stamp_1 = require("./abi-hash-stamp");
+let resolvedLocalStamp;
+function isValidAbiHashStamp(value) {
+    return /^_[A-Za-z0-9_]+$/.test(value);
+}
+function resolveLocalAbiHashStamp() {
+    if (!resolvedLocalStamp) {
+        resolvedLocalStamp = `_local_${Math.floor(Date.now() / 1000)}`;
+    }
+    return resolvedLocalStamp;
+}
+function resolveAnQstWebBaseAbiHashStamp() {
+    const fromEnv = process.env.ANQST_WEBBASE_ABI_HASH_STAMP?.trim();
+    if (fromEnv && isValidAbiHashStamp(fromEnv)) {
+        return fromEnv;
+    }
+    const generated = abi_hash_stamp_1.ANQST_WEBBASE_ABI_HASH_STAMP.trim();
+    if (generated && generated !== "_local_0" && isValidAbiHashStamp(generated)) {
+        return generated;
+    }
+    return resolveLocalAbiHashStamp();
+}
+function anqstWebBaseTargetName(stamp = resolveAnQstWebBaseAbiHashStamp()) {
+    return `anqstwebhost${stamp}`;
+}
+function anqstWebBaseNamespaceName(stamp = resolveAnQstWebBaseAbiHashStamp()) {
+    return `anqstwebbase${stamp}`;
+}

package/dist/src/app.js

@@ -19,6 +19,8 @@ const project_1 = require("./project");
 const layout_1 = require("./layout");
 const parser_1 = require("./parser");
 const verify_1 = require("./verify");
+const webbase_1 = require("./webbase");
+const abi_hash_1 = require("./abi-hash");
 class CliUsageError extends Error {
     constructor(message) {
         super(message);
@@ -45,13 +47,16 @@ function renderHelp() {
         "Commands:",
         "  instill <WidgetName>       Initialize AnQst in current npm project",
         "  test                        Verify AnQst spec from package settings",
-        "  build [--designerplugin[=true|false]]   Generate artifacts from package settings",
+        "  build [--designerplugin[=true|false]] [--noShared|--useShared]   Generate artifacts from package settings",
         "  generate <specFile>         Generate artifacts from explicit spec file",
         "  verify <specFile>           Verify explicit spec file only",
         "  clean <path> [-f|--force]   Remove generated artifacts under path",
         "",
         "Options:",
+        "  --writeSharedBaseWidget   Write bundled AnQstWebBase to ./AnQstWebBase and exit",
         "  --designerplugin            Build Qt Designer plugin (build command only, QWidget target required)",
+        "  --noShared                  Vendor AnQstWebBase for this build, overriding settings",
+        "  --useShared                 Require shared AnQstWebBase for this build, overriding settings",
         "  -h, --help                  Show this help output",
         "  -v, --version               Print CLI version"
     ].join("\n");
@@ -60,7 +65,7 @@ function usageFor(command) {
     if (command === "instill")
         return "Usage: anqst instill <WidgetName>";
     if (command === "build")
-        return "Usage: anqst build [--designerplugin[=true|false]]";
+        return "Usage: anqst build [--designerplugin[=true|false]] [--noShared|--useShared]";
     if (command === "verify")
         return "Usage: anqst verify <specFile>";
     if (command === "generate")
@@ -143,10 +148,10 @@ function runGenerate(specArg) {
     const verification = (0, verify_1.verifySpec)(parsed);
     const generationTargets = resolveGenerationTargetsFromCwd(cwd);
     resetGeneratedTargets(cwd, parsed.widgetName, generationTargets);
-    const outputs = (0, emit_1.generateOutputs)(parsed, generationTargets);
+    const outputs = (0, emit_1.generateOutputs)(parsed, { ...generationTargets, useSharedBaseWidget: true });
     (0, emit_1.writeGeneratedOutputs)(cwd, outputs);
     if (generationTargets.emitQWidget) {
-        (0, emit_1.installQtIntegrationCMake)(cwd, parsed.widgetName);
+        (0, emit_1.installQtIntegrationCMake)(cwd, parsed.widgetName, { useSharedBaseWidget: true });
     }
     return {
         success: true,
@@ -163,14 +168,11 @@ function runTest(cwd) {
         message: verification.message
     };
 }
-function resolveAnQstGenRoot() {
-    return node_path_1.default.resolve(__dirname, "..", "..");
-}
 function readActiveBuildStamp() {
     if (process.env.ANQST_BUILD_STAMP && process.env.ANQST_BUILD_STAMP.trim().length > 0) {
         return process.env.ANQST_BUILD_STAMP.trim();
     }
-    const activePath = node_path_1.default.join(resolveAnQstGenRoot(), ANQSTGEN_ACTIVE_STAMP_FILE);
+    const activePath = node_path_1.default.join((0, webbase_1.resolveAnQstGenRoot)(), ANQSTGEN_ACTIVE_STAMP_FILE);
     if (!node_fs_1.default.existsSync(activePath)) {
         return "unknown_build_0";
     }
@@ -185,13 +187,34 @@ function readActiveBuildStamp() {
     }
     return "unknown_build_0";
 }
-function runDesignerPluginBuild(cwd, widgetName) {
+function writeSharedBaseWidgetFromPackage(cwd) {
+    const targetDir = node_path_1.default.join(cwd, webbase_1.ANQST_WEBBASE_DIR_NAME);
+    if (node_fs_1.default.existsSync(targetDir)) {
+        console.error("Refusing to overwrite existing AnQstWebBase, delete it and run again.");
+        return 1;
+    }
+    try {
+        (0, webbase_1.copyAnQstWebBaseTree)((0, webbase_1.resolveAnQstWebBaseSourceDir)(), targetDir);
+    }
+    catch (error) {
+        node_fs_1.default.rmSync(targetDir, { recursive: true, force: true });
+        const reason = error instanceof Error ? error.message : String(error);
+        console.error(`Failed to write AnQstWebBase to ${cwd}: ${reason}`);
+        return 1;
+    }
+    console.log(`AnQstWebBase written to ${(0, layout_1.normalizeSlashes)(targetDir)}`);
+    return 0;
+}
+function runDesignerPluginBuild(cwd, widgetName, useSharedBaseWidget) {
     const layout = (0, layout_1.resolveGeneratedLayoutPaths)(cwd, widgetName);
     const pluginSourceDir = layout.designerPluginRoot;
     const pluginBuildDir = layout.designerPluginBuildRoot;
-    const webBaseDir = process.env.ANQST_WEBBASE_DIR?.trim();
-    if (!webBaseDir) {
-        throw new errors_1.VerifyError("Missing ANQST_WEBBASE_DIR environment variable for --designerplugin build.");
+    const webBaseDir = process.env.ANQST_WEBBASE_DIR?.trim()
+        || (useSharedBaseWidget
+            ? (0, webbase_1.resolveAnQstWebBaseSourceDir)()
+            : node_path_1.default.join(layout.cppQtWidgetRoot, webbase_1.ANQST_WEBBASE_DIR_NAME));
+    if (!node_fs_1.default.existsSync(node_path_1.default.join(webBaseDir, "CMakeLists.txt"))) {
+        throw new errors_1.VerifyError(`Unable to locate AnQstWebBase sources for --designerplugin build at '${(0, layout_1.normalizeSlashes)(webBaseDir)}'.`);
     }
     const configureArgs = [
         "-S",
@@ -221,13 +244,14 @@ function runDesignerPluginBuild(cwd, widgetName) {
         throw new errors_1.VerifyError("CMake build failed while compiling Qt Designer plugin.");
     }
 }
-function runBuild(cwd, designerPlugin = false) {
+function runBuild(cwd, designerPlugin = false, useSharedBaseWidgetOverride) {
     const buildVersion = readActiveBuildStamp();
     process.env.ANQST_BUILD_STAMP = buildVersion;
     try {
         const specPath = (0, project_1.resolveAnQstSpecPath)(cwd);
         const configuredWidgetName = (0, project_1.resolveAnQstWidgetName)(cwd);
         const configuredTargets = (0, project_1.resolveAnQstGenerateTargets)(cwd);
+        const useSharedBaseWidget = useSharedBaseWidgetOverride ?? (0, project_1.resolveAnQstUseSharedBaseWidget)(cwd);
         const generationTargets = resolveGenerationTargetsFromCwd(cwd, true);
         const preferredFrontendTarget = firstBrowserFrontendTarget(configuredTargets);
         const parsed = (0, parser_1.parseSpecFile)(specPath);
@@ -236,10 +260,13 @@ function runBuild(cwd, designerPlugin = false) {
             throw new errors_1.VerifyError(`Settings widgetName '${configuredWidgetName}' does not match spec namespace '${parsed.widgetName}'.`);
         }
         resetGeneratedTargets(cwd, parsed.widgetName, generationTargets);
-        const outputs = (0, emit_1.generateOutputs)(parsed, generationTargets);
+        const outputs = (0, emit_1.generateOutputs)(parsed, { ...generationTargets, useSharedBaseWidget });
         (0, emit_1.writeGeneratedOutputs)(cwd, outputs);
         if (generationTargets.emitQWidget) {
-            (0, emit_1.installQtIntegrationCMake)(cwd, parsed.widgetName);
+            if (!useSharedBaseWidget) {
+                (0, emit_1.installVendoredAnQstWebBase)(cwd, parsed.widgetName);
+            }
+            (0, emit_1.installQtIntegrationCMake)(cwd, parsed.widgetName, { useSharedBaseWidget });
         }
         const shouldRunAngularBuild = generationTargets.emitQWidget
             && preferredFrontendTarget === "AngularService"
@@ -284,8 +311,8 @@ function runBuild(cwd, designerPlugin = false) {
             }
             else {
                 const widgetCategory = (0, project_1.resolveAnQstWidgetCategory)(cwd);
-                (0, emit_1.installQtDesignerPluginCMake)(cwd, parsed.widgetName, { widgetCategory });
-                runDesignerPluginBuild(cwd, parsed.widgetName);
+                (0, emit_1.installQtDesignerPluginCMake)(cwd, parsed.widgetName, { widgetCategory, useSharedBaseWidget });
+                runDesignerPluginBuild(cwd, parsed.widgetName, useSharedBaseWidget);
                 designerPluginBuilt = true;
             }
         }
@@ -321,7 +348,12 @@ function runBuild(cwd, designerPlugin = false) {
             detailLines.push(`      - Browser global: window.AnQstGenerated.${parsed.widgetName}`);
         }
         if (generationTargets.emitQWidget) {
+            const widgetClassName = `${parsed.widgetName}Widget`;
             detailLines.push("    Target QWidget:");
+            detailLines.push(`      - QWidget name: ${widgetClassName}`);
+            detailLines.push(`      - AnQstWebBase module: ${useSharedBaseWidget
+                ? `External ${(0, abi_hash_1.anqstWebBaseTargetName)()}, see anqst --help for more info`
+                : `Embedded in ${widgetClassName}`}`);
             detailLines.push(`      - Qt integration CMake: ${(0, layout_1.toProjectRelative)(cwd, node_path_1.default.join(layout.cppCmakeRoot, "CMakeLists.txt"))}`);
             detailLines.push(`      - Widget output root: ${(0, layout_1.toProjectRelative)(cwd, layout.cppQtWidgetRoot)}`);
             detailLines.push("      - C++ handoff: downstream CMake consumes this generated tree directly");
@@ -373,6 +405,7 @@ function parseSpecCommandArg(commandName, specArg, extraArgs) {
 function parseBuildCommandArgs(specArg, extraArgs) {
     const allArgs = [specArg, ...extraArgs].filter((arg) => typeof arg === "string" && arg.length > 0);
     let designerPlugin = false;
+    let useSharedBaseWidgetOverride;
     const positional = [];
     for (let i = 0; i < allArgs.length; i += 1) {
         const arg = allArgs[i];
@@ -392,6 +425,14 @@ function parseBuildCommandArgs(specArg, extraArgs) {
             designerPlugin = value.toLowerCase() === "true";
             continue;
         }
+        if (arg === "--noShared") {
+            useSharedBaseWidgetOverride = false;
+            continue;
+        }
+        if (arg === "--useShared") {
+            useSharedBaseWidgetOverride = true;
+            continue;
+        }
         if (arg.startsWith("-")) {
             throw new CliUsageError(`Unknown build flag '${arg}'. ${usageFor("build")}`);
         }
@@ -400,7 +441,7 @@ function parseBuildCommandArgs(specArg, extraArgs) {
     if (positional.length > 0) {
         throw new CliUsageError(`Unexpected extra argument '${positional[0]}'. ${usageFor("build")}`);
     }
-    return { designerPlugin };
+    return { designerPlugin, useSharedBaseWidgetOverride };
 }
 function parseCleanCommandArgs(specArg, extraArgs) {
     const allArgs = [specArg, ...extraArgs].filter((arg) => typeof arg === "string" && arg.length > 0);
@@ -564,6 +605,13 @@ function runCommand(command, specArg, extraArgs = []) {
             console.error(renderHelp());
             return 1;
         }
+        if (command === "--writeSharedBaseWidget") {
+            if (specArg || extraArgs.length > 0) {
+                console.error("Usage: anqst --writeSharedBaseWidget");
+                return 1;
+            }
+            return writeSharedBaseWidgetFromPackage(process.cwd());
+        }
         if (command === "-h" || command === "--help" || command === "help") {
             console.log(renderHelp());
             return 0;
@@ -592,7 +640,7 @@ function runCommand(command, specArg, extraArgs = []) {
         }
         if (normalizedCommand === "build") {
             const parsedArgs = parseBuildCommandArgs(specArg, extraArgs);
-            const res = runBuild(process.cwd(), parsedArgs.designerPlugin);
+            const res = runBuild(process.cwd(), parsedArgs.designerPlugin, parsedArgs.useSharedBaseWidgetOverride);
             console.log(res.message);
             return 0;
         }

package/dist/src/boundary-codec-render.js

@@ -3,10 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderTsBoundaryCodecHelpers = renderTsBoundaryCodecHelpers;
 exports.renderCppBoundaryCodecHelpers = renderCppBoundaryCodecHelpers;
 const base93_1 = require("./base93");
+const abi_hash_1 = require("./abi-hash");
 const boundary_codec_model_1 = require("./boundary-codec-model");
 function indent(level) {
     return "  ".repeat(level);
 }
+function cppBase93EncodeFunction() {
+    return `${(0, abi_hash_1.anqstWebBaseNamespaceName)()}::anqstBase93Encode`;
+}
+function cppBase93DecodeFunction() {
+    return `${(0, abi_hash_1.anqstWebBaseNamespaceName)()}::anqstBase93Decode`;
+}
 class TsEmitterContext {
     constructor() {
         this.nextId = 0;
@@ -315,10 +322,10 @@ function emitCppInlineScalarRead(leaf, lines, ctx, level) {
     }
 }
 function cppInlineBinaryEncodeExpr(valueExpr) {
-    return `anqstBase93Encode(std::vector<std::uint8_t>(${valueExpr}.begin(), ${valueExpr}.end()))`;
+    return `${cppBase93EncodeFunction()}(std::vector<std::uint8_t>(${valueExpr}.begin(), ${valueExpr}.end()))`;
 }
 function cppInlineBinaryDecodeExpr(encodedExpr) {
-    return `([&]() { const auto __bytes = anqstBase93Decode(${encodedExpr}); return QByteArray(reinterpret_cast<const char*>(__bytes.data()), static_cast<int>(__bytes.size())); })()`;
+    return `([&]() { const auto __bytes = ${cppBase93DecodeFunction()}(${encodedExpr}); return QByteArray(reinterpret_cast<const char*>(__bytes.data()), static_cast<int>(__bytes.size())); })()`;
 }
 function binaryEncodeHelperName(binary) {
     return `__anqstEncodeBinary_${binary}`;
@@ -1366,11 +1373,11 @@ function renderCppFastPathCodec(plan, mapCppType) {
             return `inline QVariant ${encoderName}(const ${cppType}& value) {
     std::vector<std::uint8_t> bytes;
 ${encodeLines.join("\n")}
-    return anqstBase93Encode(bytes);
+    return ${cppBase93EncodeFunction()}(bytes);
 }
 
 inline ${cppType} ${decoderName}(const QVariant& wire) {
-    const std::vector<std::uint8_t> blob = anqstBase93Decode(wire.toString());
+    const std::vector<std::uint8_t> blob = ${cppBase93DecodeFunction()}(wire.toString());
     std::size_t dataOffset = 0;
 ${decodeBody.join("\n")}
     const ${cppType} result = ${decodeExpr};
@@ -1422,8 +1429,8 @@ inline ${cppType} ${decoderName}(const QVariant& wire) {
             else {
                 emitCppInlineScalarWrite(plan.root.representation.scalarKind, `static_cast<std::${plan.root.representation.scalarKind}_t>(code)`, encodeLines, encodeCtx, 1);
             }
-            encodeLines.push(`    return anqstBase93Encode(bytes);`);
-            const decodeLines = ["    const std::vector<std::uint8_t> blob = anqstBase93Decode(wire.toString());", "    std::size_t dataOffset = 0;"];
+            encodeLines.push(`    return ${cppBase93EncodeFunction()}(bytes);`);
+            const decodeLines = [`    const std::vector<std::uint8_t> blob = ${cppBase93DecodeFunction()}(wire.toString());`, "    std::size_t dataOffset = 0;"];
             const decodeBody = [];
             const expr = emitCppDecodeNode(plan.root, decodeBody, new CppEmitterContext(), 1, mapCppType);
             return `inline QVariant ${encoderName}(const ${cppType}& value) {
@@ -1524,7 +1531,7 @@ ${encodeLines.join("\n")}
 
 inline ${cppType} ${decoderName}(const QVariant& wire) {
     const QVariantList items = anqstNormalizeWireItems(wire);
-    const std::vector<std::uint8_t> blob = ${plan.requirements.hasBlob ? `(items.isEmpty() ? std::vector<std::uint8_t>{} : anqstBase93Decode(items.value(0).toString()))` : "std::vector<std::uint8_t>{}"};
+    const std::vector<std::uint8_t> blob = ${plan.requirements.hasBlob ? `(items.isEmpty() ? std::vector<std::uint8_t>{} : ${cppBase93DecodeFunction()}(items.value(0).toString()))` : "std::vector<std::uint8_t>{}"};
     std::size_t itemIndex = ${plan.requirements.hasBlob ? 1 : 0};
     std::size_t dataOffset = 0;
 ${decodeLines.join("\n")}
@@ -1596,7 +1603,7 @@ function renderCppRuntimeSupport(catalog, mapCppType) {
     else {
         lines.push("    QVariantList out;");
         lines.push("    out.reserve(static_cast<qsizetype>(items.size() + 1));");
-        lines.push("    out.push_back(anqstBase93Encode(bytes));");
+        lines.push(`    out.push_back(${cppBase93EncodeFunction()}(bytes));`);
         lines.push("    for (const auto& item : items) out.push_back(item);");
         lines.push("    return out;");
         lines.push("}");
@@ -1719,11 +1726,11 @@ function renderCppRuntimeSupport(catalog, mapCppType) {
     }
     if (support.needsBinaryHelpers) {
         lines.push("inline QString anqstEncodeBinary(const QByteArray& value) {");
-        lines.push("    return anqstBase93Encode(std::vector<std::uint8_t>(value.begin(), value.end()));");
+        lines.push(`    return ${cppBase93EncodeFunction()}(std::vector<std::uint8_t>(value.begin(), value.end()));`);
         lines.push("}");
         lines.push("");
         lines.push("inline QByteArray anqstDecodeBinary(const QString& encoded) {");
-        lines.push("    const auto bytes = anqstBase93Decode(encoded);");
+        lines.push(`    const auto bytes = ${cppBase93DecodeFunction()}(encoded);`);
         lines.push("    return QByteArray(reinterpret_cast<const char*>(bytes.data()), static_cast<int>(bytes.size()));");
         lines.push("}");
     }

package/dist/src/emit.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateOutputs = generateOutputs;
 exports.writeGeneratedOutputs = writeGeneratedOutputs;
+exports.installVendoredAnQstWebBase = installVendoredAnQstWebBase;
 exports.buildVanillaJsBrowserBundle = buildVanillaJsBrowserBundle;
 exports.installEmbeddedWebBundle = installEmbeddedWebBundle;
 exports.installQtIntegrationCMake = installQtIntegrationCMake;
@@ -13,7 +14,9 @@ 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 abi_hash_1 = require("./abi-hash");
 const layout_1 = require("./layout");
+const webbase_1 = require("./webbase");
 const boundary_codecs_1 = require("./boundary-codecs");
 function stripAnQstType(typeText) {
     return typeText
@@ -1226,6 +1229,7 @@ function renderWidgetUmbrellaHeader(spec) {
 }
 function renderWidgetHeader(spec, cppTypes, cppCodecCatalog) {
     const widgetClassName = `${spec.widgetName}Widget`;
+    const webBaseNamespace = (0, abi_hash_1.anqstWebBaseNamespaceName)();
     const dragDropPayloadHelpers = collectDragDropPayloadHelpers(spec, cppTypes, cppCodecCatalog);
     const callbackAliases = [];
     const publicMethods = [];
@@ -1319,7 +1323,7 @@ namespace ${spec.widgetName} {
 
 using namespace ${spec.widgetName};
 
-class ${widgetClassName} : public AnQstWebHostBase {
+class ${widgetClassName} : public ${webBaseNamespace}::AnQstWebHostBase {
     Q_OBJECT
 ${properties.map((p) => `    ${p}`).join("\n")}
 
@@ -1387,6 +1391,8 @@ ${fields.map((f) => `    ${f}`).join("\n")}
 }
 function renderCppStub(spec, cppTypes, cppCodecCatalog) {
     const widgetClassName = `${spec.widgetName}Widget`;
+    const webBaseNamespace = (0, abi_hash_1.anqstWebBaseNamespaceName)();
+    const webBaseClassName = `${webBaseNamespace}::AnQstWebHostBase`;
     const dragDropPayloadHelpers = collectDragDropPayloadHelpers(spec, cppTypes, cppCodecCatalog);
     const cppCodecHelpers = (0, boundary_codecs_1.renderCppBoundaryCodecHelpers)(cppCodecCatalog, (typeText, pathHintParts) => cppTypes.mapTypeText(typeText, pathHintParts)).trim();
     const lines = [];
@@ -1520,7 +1526,7 @@ function renderCppStub(spec, cppTypes, cppCodecCatalog) {
             lines.push("");
         }
     }
-    lines.push(`${widgetClassName}::${widgetClassName}(QWidget* parent) : AnQstWebHostBase(parent), handle(this) {`);
+    lines.push(`${widgetClassName}::${widgetClassName}(QWidget* parent) : ${webBaseClassName}(parent), handle(this) {`);
     lines.push(`    static const bool kResourcesInitialized = []() {`);
     lines.push(`        ::qInitResources_${spec.widgetName}();`);
     lines.push(`        return true;`);
@@ -1548,7 +1554,7 @@ function renderCppStub(spec, cppTypes, cppCodecCatalog) {
                 const cppType = cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]);
                 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(`    QObject::connect(this, &${webBaseClassName}::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}")) {`);
                 if (payloadSite) {
                     lines.push(`            if (payload.type() != QVariant::String) {`);
@@ -1592,7 +1598,7 @@ function renderCppStub(spec, cppTypes, cppCodecCatalog) {
                 const cppType = cppTypes.mapTypeText(member.payloadTypeText, [service.name, member.name, "Payload"]);
                 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(`    QObject::connect(this, &${webBaseClassName}::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}")) {`);
                 if (payloadSite) {
                     lines.push(`            if (payload.type() != QVariant::String) {`);
@@ -1631,7 +1637,7 @@ function renderCppStub(spec, cppTypes, cppCodecCatalog) {
                 }
                 lines.push(`        }`);
                 lines.push(`    });`);
-                lines.push(`    QObject::connect(this, &AnQstWebHostBase::anQstBridge_hoverLeft, this, [this](const QString& service, const QString& member) {`);
+                lines.push(`    QObject::connect(this, &${webBaseClassName}::anQstBridge_hoverLeft, this, [this](const QString& service, const QString& member) {`);
                 lines.push(`        if (service == QStringLiteral("${service.name}") && member == QStringLiteral("${member.name}")) {`);
                 lines.push(`            emit ${member.name}Left();`);
                 lines.push(`        }`);
@@ -1639,7 +1645,7 @@ function renderCppStub(spec, cppTypes, cppCodecCatalog) {
             }
         }
     }
-    lines.push(`    QObject::connect(this, &AnQstWebHostBase::onHostError, this, &${widgetClassName}::diagnosticsForwarded);`);
+    lines.push(`    QObject::connect(this, &${webBaseClassName}::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));`);
@@ -1651,7 +1657,7 @@ function renderCppStub(spec, cppTypes, cppCodecCatalog) {
     lines.push(`${widgetClassName}::~${widgetClassName}() = default;`);
     lines.push("");
     lines.push(`bool ${widgetClassName}::enableDebug() {`);
-    lines.push(`    return AnQstWebHostBase::enableDebug();`);
+    lines.push(`    return ${webBaseClassName}::enableDebug();`);
     lines.push("}");
     lines.push("");
     lines.push(`QString ${widgetClassName}::makeBindingKey(const QString& service, const QString& member) {`);
@@ -1941,18 +1947,37 @@ function renderCppStub(spec, cppTypes, cppCodecCatalog) {
         }
     }
     lines.push(`void ${widgetClassName}::connectNotify(const QMetaMethod& signal) {`);
-    lines.push(`    AnQstWebHostBase::connectNotify(signal);`);
+    lines.push(`    ${webBaseClassName}::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(`    ${webBaseClassName}::disconnectNotify(signal);`);
     lines.push(`    Q_UNUSED(signal);`);
     lines.push(`}`);
     lines.push("");
     return lines.join("\n");
 }
-function renderCMake(spec) {
+function renderWebBaseTargetCMake(widgetName, useSharedBaseWidget) {
+    const webBaseTarget = (0, abi_hash_1.anqstWebBaseTargetName)();
+    if (useSharedBaseWidget) {
+        return `if(NOT TARGET ${webBaseTarget})
+    message(FATAL_ERROR "Target '${webBaseTarget}' is required before adding generated widget library ${widgetName}Widget.")
+endif()`;
+    }
+    return `set(ANQST_GENERATED_WEBBASE_DIR "\${CMAKE_CURRENT_SOURCE_DIR}/${webbase_1.ANQST_WEBBASE_DIR_NAME}")
+if(NOT EXISTS "\${ANQST_GENERATED_WEBBASE_DIR}/CMakeLists.txt")
+    message(FATAL_ERROR "Generated ${webbase_1.ANQST_WEBBASE_DIR_NAME} sources are missing for ${widgetName}Widget. Run 'npx anqst build' again.")
+endif()
+set(ANQSTWEBBASE_BUILD_TESTS OFF CACHE BOOL "Build ${webbase_1.ANQST_WEBBASE_DIR_NAME} unit tests" FORCE)
+if(NOT TARGET ${webBaseTarget})
+    add_subdirectory("\${ANQST_GENERATED_WEBBASE_DIR}" "\${CMAKE_CURRENT_BINARY_DIR}/anqstwebbase")
+endif()
+if(NOT TARGET ${webBaseTarget})
+    message(FATAL_ERROR "Target '${webBaseTarget}' was not created from generated ${webbase_1.ANQST_WEBBASE_DIR_NAME} sources for ${widgetName}Widget.")
+endif()`;
+}
+function renderCMake(spec, useSharedBaseWidget = true) {
     return `cmake_minimum_required(VERSION 3.21)
 project(${spec.widgetName}Library LANGUAGES CXX)
 
@@ -1961,9 +1986,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
-if(NOT TARGET anqstwebhostbase)
-    message(FATAL_ERROR "Target 'anqstwebhostbase' is required before adding generated widget library ${spec.widgetName}Widget.")
-endif()
+${renderWebBaseTargetCMake(spec.widgetName, useSharedBaseWidget)}
 
 add_library(${spec.widgetName}Widget
     ${spec.widgetName}.cpp
@@ -1978,10 +2001,10 @@ target_include_directories(${spec.widgetName}Widget
 )
 target_link_libraries(${spec.widgetName}Widget
     PUBLIC
-        anqstwebhostbase
+        ${(0, abi_hash_1.anqstWebBaseTargetName)()}
 )
 
-# Uses transitive Qt and include requirements from anqstwebhostbase.
+# Uses transitive Qt and include requirements from ${(0, abi_hash_1.anqstWebBaseTargetName)()}.
 `;
 }
 function escapeXml(text) {
@@ -5315,7 +5338,8 @@ function generateOutputs(spec, options = {}) {
         emitAngularService: options.emitAngularService ?? true,
         emitVanillaTS: options.emitVanillaTS ?? useDefaultBrowserTargets,
         emitVanillaJS: options.emitVanillaJS ?? useDefaultBrowserTargets,
-        emitNodeExpressWs: options.emitNodeExpressWs ?? false
+        emitNodeExpressWs: options.emitNodeExpressWs ?? false,
+        useSharedBaseWidget: options.useSharedBaseWidget ?? true
     };
     const angularFrontendDir = `frontend/${(0, layout_1.generatedFrontendDirName)(spec.widgetName, "AngularService")}`;
     const vanillaTsFrontendDir = `frontend/${(0, layout_1.generatedFrontendDirName)(spec.widgetName, "VanillaTS")}`;
@@ -5353,7 +5377,7 @@ function generateOutputs(spec, options = {}) {
     }
     if (normalizedOptions.emitQWidget) {
         const cppTypes = buildCppTypeContext(spec);
-        outputs[`${cppDir}/CMakeLists.txt`] = renderCMake(spec);
+        outputs[`${cppDir}/CMakeLists.txt`] = renderCMake(spec, normalizedOptions.useSharedBaseWidget);
         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, codecCatalog);
@@ -5375,6 +5399,10 @@ function writeGeneratedOutputs(cwd, outputs) {
         node_fs_1.default.writeFileSync(filePath, withBuildStamp(relPath, content), "utf8");
     }
 }
+function installVendoredAnQstWebBase(cwd, widgetName) {
+    const webBaseRoot = node_path_1.default.join((0, layout_1.resolveGeneratedLayoutPaths)(cwd, widgetName).cppQtWidgetRoot, webbase_1.ANQST_WEBBASE_DIR_NAME);
+    (0, webbase_1.installAnQstWebBaseTree)(webBaseRoot);
+}
 function normalizeVanillaJsIndexHtml(html) {
     let normalized = html.replace(/<script\b[^>]*src=["'](?:\.\/)?main\.js["'][^>]*>\s*<\/script>\s*/gi, "");
     const bundleScriptTag = '  <script defer src="./main.js"></script>\n';
@@ -5585,13 +5613,30 @@ function normalizeEmbeddedIndexHtml(indexPath, webRoot) {
     });
     node_fs_1.default.writeFileSync(indexPath, html, "utf8");
 }
-function renderQtIntegrationCMake(widgetName) {
+function renderQtIntegrationWebBaseCMake(widgetName, generatedRootVar, useSharedBaseWidget) {
+    const webBaseTarget = (0, abi_hash_1.anqstWebBaseTargetName)();
+    if (useSharedBaseWidget) {
+        return `if(NOT TARGET ${webBaseTarget})
+    message(FATAL_ERROR "Target '${webBaseTarget}' must exist before including generated AnQst CMake for ${widgetName}.")
+endif()`;
+    }
+    return `set(ANQST_GENERATED_WEBBASE_DIR "\${${generatedRootVar}}/${webbase_1.ANQST_WEBBASE_DIR_NAME}")
+set(ANQSTWEBBASE_BUILD_TESTS OFF CACHE BOOL "Build ${webbase_1.ANQST_WEBBASE_DIR_NAME} unit tests" FORCE)
+if(NOT TARGET ${webBaseTarget})
+    add_subdirectory("\${ANQST_GENERATED_WEBBASE_DIR}" "\${CMAKE_CURRENT_BINARY_DIR}/anqstwebbase")
+endif()`;
+}
+function renderQtIntegrationCMake(widgetName, options = {}) {
     const generatedRootVar = "ANQST_GENERATED_WIDGET_DIR";
     const generatedIncludeVar = "ANQST_GENERATED_INCLUDE_DIR";
     const projectRootVar = "ANQST_PROJECT_ROOT";
     const requiredFilesVar = "ANQST_REQUIRED_GENERATED_FILES";
     const widgetBinaryDirVar = "ANQST_GENERATED_WIDGET_BINARY_DIR";
     const widgetTarget = `${widgetName}Widget`;
+    const useSharedBaseWidget = options.useSharedBaseWidget ?? true;
+    const vendoredRequiredFiles = useSharedBaseWidget
+        ? ""
+        : `    "\${${generatedRootVar}}/${webbase_1.ANQST_WEBBASE_DIR_NAME}/CMakeLists.txt"\n`;
     return `cmake_minimum_required(VERSION 3.21)
 
 set(${projectRootVar} "\${CMAKE_CURRENT_LIST_DIR}/../../../../..")
@@ -5603,10 +5648,6 @@ if(TARGET ${widgetTarget})
     return()
 endif()
 
-if(NOT TARGET anqstwebhostbase)
-    message(FATAL_ERROR "Target 'anqstwebhostbase' must exist before including generated AnQst CMake for ${widgetName}.")
-endif()
-
 set(${requiredFilesVar}
     "\${${generatedRootVar}}/CMakeLists.txt"
     "\${${generatedRootVar}}/${widgetName}.qrc"
@@ -5615,7 +5656,7 @@ set(${requiredFilesVar}
     "\${${generatedIncludeVar}}/${widgetName}Widget.h"
     "\${${generatedIncludeVar}}/${widgetName}Types.h"
     "\${${generatedRootVar}}/webapp/index.html"
-)
+${vendoredRequiredFiles})
 
 foreach(required_file IN LISTS ${requiredFilesVar})
     if(NOT EXISTS "\${required_file}")
@@ -5627,13 +5668,15 @@ foreach(required_file IN LISTS ${requiredFilesVar})
     endif()
 endforeach()
 
+${renderQtIntegrationWebBaseCMake(widgetName, generatedRootVar, useSharedBaseWidget)}
+
 add_subdirectory("\${${generatedRootVar}}" "\${${widgetBinaryDirVar}}")
 `;
 }
-function installQtIntegrationCMake(cwd, widgetName) {
+function installQtIntegrationCMake(cwd, widgetName, options = {}) {
     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("backend/cpp/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, options)), "utf8");
 }
 function normalizeIcoSize(dim) {
     return dim === 0 ? 256 : dim;
@@ -5858,10 +5901,12 @@ public:
 #include "${pluginClass}.moc"
 `;
 }
-function renderQtDesignerPluginCMake(widgetName, hasIcon) {
+function renderQtDesignerPluginCMake(widgetName, hasIcon, useSharedBaseWidget = true) {
     const widgetTarget = `${widgetName}Widget`;
     const pluginTarget = `${widgetName}DesignerPlugin`;
+    const webBaseTarget = (0, abi_hash_1.anqstWebBaseTargetName)();
     const resourceLine = hasIcon ? "    \"${CMAKE_CURRENT_LIST_DIR}/designerplugin.qrc\"\n" : "";
+    const defaultWebBaseDir = useSharedBaseWidget ? "" : `\${ANQST_WIDGET_DIR}/${webbase_1.ANQST_WEBBASE_DIR_NAME}`;
     return `cmake_minimum_required(VERSION 3.21)
 project(${pluginTarget} LANGUAGES CXX)
 
@@ -5873,7 +5918,7 @@ set(CMAKE_AUTORCC ON)
 
 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")
+set(ANQST_WEBBASE_DIR "${defaultWebBaseDir}" CACHE PATH "Path to ${webbase_1.ANQST_WEBBASE_DIR_NAME} source directory")
 
 if(NOT EXISTS "\${ANQST_WIDGET_DIR}/CMakeLists.txt")
     message(FATAL_ERROR "Missing generated widget CMake project at \${ANQST_WIDGET_DIR}. Run 'anqst build' first.")
@@ -5881,6 +5926,7 @@ endif()
 
 if(NOT ANQST_WEBBASE_DIR)
     foreach(candidate
+        "\${ANQST_PROJECT_ROOT}/node_modules/@dusted/anqst/${webbase_1.ANQST_WEBBASE_DIR_NAME}"
         "\${ANQST_PROJECT_ROOT}/AnQstWidget/AnQstWebBase"
         "\${ANQST_PROJECT_ROOT}/../AnQstWidget/AnQstWebBase"
         "\${ANQST_PROJECT_ROOT}/../../AnQstWidget/AnQstWebBase"
@@ -5893,13 +5939,13 @@ if(NOT ANQST_WEBBASE_DIR)
 endif()
 
 if(NOT ANQST_WEBBASE_DIR OR NOT EXISTS "\${ANQST_WEBBASE_DIR}/CMakeLists.txt")
-    message(FATAL_ERROR "Unable to locate AnQstWebBase sources. Set -DANQST_WEBBASE_DIR=<path/to/AnQstWidget/AnQstWebBase>.")
+    message(FATAL_ERROR "Unable to locate ${webbase_1.ANQST_WEBBASE_DIR_NAME} sources. Set -DANQST_WEBBASE_DIR=<path/to/${webbase_1.ANQST_WEBBASE_DIR_NAME}>.")
 endif()
 
 find_package(Qt5 REQUIRED COMPONENTS Core Widgets UiPlugin)
 
 set(ANQSTWEBBASE_BUILD_TESTS OFF CACHE BOOL "Build AnQstWebBase unit tests" FORCE)
-if(NOT TARGET anqstwebhostbase)
+if(NOT TARGET ${webBaseTarget})
     add_subdirectory("\${ANQST_WEBBASE_DIR}" "\${CMAKE_CURRENT_BINARY_DIR}/anqstwebbase")
 endif()
 
@@ -5933,6 +5979,6 @@ function installQtDesignerPluginCMake(cwd, widgetName, options = {}) {
     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(`backend/cpp/qt/${generatedCppLibraryDirName(widgetName)}/designerPlugin/CMakeLists.txt`, renderQtDesignerPluginCMake(widgetName, 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, options.useSharedBaseWidget ?? true)), "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");
 }