@dusted/anqst 1.5.1 → 1.7.0

package/README.md

@@ -43,7 +43,7 @@ Settings file (`./AnQst/<WidgetName>.settings.json`) owns project-local AnQst co
   "layoutVersion": 2,
   "widgetName": "<WidgetName>",
   "spec": "./AnQst/<WidgetName>.AnQst.d.ts",
-  "generate": ["QWidget", "AngularService", "node_express_ws"],
+  "generate": ["QWidget", "AngularService", "VanillaTS", "VanillaJS", "node_express_ws"],
   "widgetCategory": "AnQst Widgets"
 }
 ```
@@ -63,6 +63,16 @@ Settings file (`./AnQst/<WidgetName>.settings.json`) owns project-local AnQst co
   - Updates `tsconfig.json` (when present):
     - `compilerOptions.paths["anqst-generated/*"] = ["AnQst/generated/frontend/<WidgetName>_Angular/*"]`
 
+Available generate targets:
+
+- Browser frontend targets:
+  - `AngularService`
+  - `VanillaTS`
+  - `VanillaJS`
+- Backend targets:
+  - `QWidget`
+  - `node_express_ws`
+
 - `anqst test`
   - Loads settings from `package.json.AnQst`.
   - Verifies the configured spec.
@@ -72,9 +82,11 @@ Settings file (`./AnQst/<WidgetName>.settings.json`) owns project-local AnQst co
   - Verifies spec and regenerates selected targets.
   - Writes only under `./AnQst/generated`.
   - Removes selected target roots before regeneration (no stale generated files).
-  - If `QWidget` is enabled and `angular.json` exists:
-    - runs production Angular build
+  - If `QWidget` is enabled and a browser build output is present under project `dist/`:
     - embeds built web assets into generated Qt widget `webapp/`.
+  - If `QWidget` is enabled and `angular.json` exists:
+    - `anqst build` may invoke a production Angular build before embedding.
+  - Browser bundle discovery is frontend-profile-neutral: Angular and Vanilla browser outputs are both expected to produce a dist tree containing `index.html`.
   - Generated Qt integration CMake consumes the existing `./AnQst/generated` widget tree and fails fast if the required generated files are missing.
   - Downstream CMake no longer invokes `npm`, `npx`, or `anqst`; run `anqst build` first, then build C++ against the generated tree.
   - If `--designerplugin` is enabled:
@@ -106,6 +118,8 @@ Settings file (`./AnQst/<WidgetName>.settings.json`) owns project-local AnQst co
     generated/
       frontend/
         <WidgetName>_Angular/
+        <WidgetName>_VanillaTS/
+        <WidgetName>_VanillaJS/
       backend/
         node/
           express/
@@ -143,10 +157,37 @@ npx @dusted/anqst test
 npx @dusted/anqst build
 ```
 
+## Vanilla browser usage
+
+Minimal browser-global usage for `VanillaJS`:
+
+```html
+<script src="./AnQst/generated/frontend/BurgerConstructor_VanillaJS/index.js"></script>
+<script>
+  (async () => {
+    const frontend = await window.AnQstGenerated.widgets.BurgerConstructor.createFrontend();
+    const ok = await frontend.services.BurgerService.validateDraft({ name: "Classic" });
+    console.log(ok);
+  })();
+</script>
+```
+
+TypeScript authors use the same runtime shape with typings from `VanillaTS`:
+
+```ts
+/// <reference path="./AnQst/generated/frontend/BurgerConstructor_VanillaTS/index.d.ts" />
+
+async function boot() {
+  const frontend = await window.AnQstGenerated.widgets.BurgerConstructor.createFrontend();
+  const ok = await frontend.services.BurgerService.validateDraft({ name: "Classic" });
+  console.log(frontend.diagnostics.state(), ok);
+}
+```
+
 ## Two-stage workflow
 
 ```bash
-# Stage 1: Node/Angular/generation environment
+# Stage 1: browser/backend/generation environment
 npx @dusted/anqst build
 
 # Stage 2: pure Qt/CMake environment, consuming the generated tree

package/dist/src/app.js

@@ -25,6 +25,14 @@ class CliUsageError extends Error {
         this.name = "CliUsageError";
     }
 }
+function firstBrowserFrontendTarget(targets) {
+    for (const target of targets) {
+        if (target === "AngularService" || target === "VanillaTS" || target === "VanillaJS") {
+            return target;
+        }
+    }
+    return null;
+}
 const ANQSTGEN_ACTIVE_STAMP_FILE = ".anqstgen-version-active.json";
 function renderHelp() {
     const version = readActiveBuildStamp();
@@ -65,7 +73,13 @@ function resetGeneratedTargets(cwd, widgetName, targets) {
     const layout = (0, layout_1.resolveGeneratedLayoutPaths)(cwd, widgetName);
     const roots = new Set();
     if (targets.emitAngularService) {
-        roots.add(layout.frontendRoot);
+        roots.add(layout.angularFrontendRoot);
+    }
+    if (targets.emitVanillaTS) {
+        roots.add(layout.vanillaTsFrontendRoot);
+    }
+    if (targets.emitVanillaJS) {
+        roots.add(layout.vanillaJsFrontendRoot);
     }
     if (targets.emitNodeExpressWs) {
         roots.add(layout.nodeExpressRoot);
@@ -84,15 +98,19 @@ function resetGeneratedTargets(cwd, widgetName, targets) {
 function buildGenerateSummary(cwd, specPath, widgetName, generationTargets) {
     const layout = (0, layout_1.resolveGeneratedLayoutPaths)(cwd, widgetName);
     const relativeSpecFile = (0, layout_1.normalizeSlashes)(node_path_1.default.relative(cwd, specPath));
-    const servicePath = (0, layout_1.toProjectRelative)(cwd, node_path_1.default.join(layout.frontendRoot, "services"));
-    const typePath = (0, layout_1.toProjectRelative)(cwd, node_path_1.default.join(layout.frontendRoot, "types"));
     const widgetRootPath = (0, layout_1.toProjectRelative)(cwd, layout.cppQtWidgetRoot);
     const nodePath = (0, layout_1.toProjectRelative)(cwd, layout.nodeExpressRoot);
     const messageLines = [];
     messageLines.push(`AnQst spec ${relativeSpecFile} built.`);
     if (generationTargets.emitAngularService) {
-        messageLines.push(`    Services are available from ${servicePath}.`);
-        messageLines.push(`    Generated types are available from ${typePath}.`);
+        messageLines.push(`    Angular services are available from ${(0, layout_1.toProjectRelative)(cwd, node_path_1.default.join(layout.angularFrontendRoot, "services"))}.`);
+        messageLines.push(`    Angular generated types are available from ${(0, layout_1.toProjectRelative)(cwd, node_path_1.default.join(layout.angularFrontendRoot, "types"))}.`);
+    }
+    if (generationTargets.emitVanillaTS) {
+        messageLines.push(`    VanillaTS browser bundle is available from ${(0, layout_1.toProjectRelative)(cwd, layout.vanillaTsFrontendRoot)}.`);
+    }
+    if (generationTargets.emitVanillaJS) {
+        messageLines.push(`    VanillaJS browser bundle is available from ${(0, layout_1.toProjectRelative)(cwd, layout.vanillaJsFrontendRoot)}.`);
     }
     if (generationTargets.emitQWidget) {
         messageLines.push(`    Widget library available in ${widgetRootPath}.`);
@@ -100,7 +118,11 @@ function buildGenerateSummary(cwd, specPath, widgetName, generationTargets) {
     if (generationTargets.emitNodeExpressWs) {
         messageLines.push(`    Node Express WS module available in ${nodePath}.`);
     }
-    if (!generationTargets.emitAngularService && !generationTargets.emitQWidget && !generationTargets.emitNodeExpressWs) {
+    if (!generationTargets.emitAngularService
+        && !generationTargets.emitVanillaTS
+        && !generationTargets.emitVanillaJS
+        && !generationTargets.emitQWidget
+        && !generationTargets.emitNodeExpressWs) {
         messageLines.push("    No outputs selected by AnQst.generate.");
     }
     return `\n${messageLines.join("\n")}\n`;
@@ -205,7 +227,9 @@ function runBuild(cwd, designerPlugin = false) {
     try {
         const specPath = (0, project_1.resolveAnQstSpecPath)(cwd);
         const configuredWidgetName = (0, project_1.resolveAnQstWidgetName)(cwd);
+        const configuredTargets = (0, project_1.resolveAnQstGenerateTargets)(cwd);
         const generationTargets = resolveGenerationTargetsFromCwd(cwd, true);
+        const preferredFrontendTarget = firstBrowserFrontendTarget(configuredTargets);
         const parsed = (0, parser_1.parseSpecFile)(specPath);
         (0, verify_1.verifySpec)(parsed);
         if (parsed.widgetName !== configuredWidgetName) {
@@ -217,8 +241,10 @@ function runBuild(cwd, designerPlugin = false) {
         if (generationTargets.emitQWidget) {
             (0, emit_1.installQtIntegrationCMake)(cwd, parsed.widgetName);
         }
-        const hasAngularProject = generationTargets.emitQWidget && node_fs_1.default.existsSync(node_path_1.default.join(cwd, "angular.json"));
-        if (hasAngularProject) {
+        const shouldRunAngularBuild = generationTargets.emitQWidget
+            && preferredFrontendTarget === "AngularService"
+            && node_fs_1.default.existsSync(node_path_1.default.join(cwd, "angular.json"));
+        if (shouldRunAngularBuild) {
             const angularBuild = (0, node_child_process_1.spawnSync)("npx", ["ng", "build", "--configuration", "production"], {
                 cwd,
                 stdio: "inherit",
@@ -228,10 +254,27 @@ function runBuild(cwd, designerPlugin = false) {
                 throw new errors_1.VerifyError("Angular build failed while preparing embedded widget assets.");
             }
         }
+        let embeddedAssetsRefreshed = false;
         if (generationTargets.emitQWidget) {
+            if (preferredFrontendTarget === "VanillaJS") {
+                try {
+                    (0, emit_1.buildVanillaJsBrowserBundle)(cwd, parsed.widgetName);
+                }
+                catch (error) {
+                    const message = error instanceof Error ? error.message : String(error);
+                    throw new errors_1.VerifyError(`VanillaJS browser packaging failed: ${message}`);
+                }
+            }
             const embedded = (0, emit_1.installEmbeddedWebBundle)(cwd, parsed.widgetName);
-            if (hasAngularProject && !embedded) {
-                throw new errors_1.VerifyError("Unable to embed Angular output. Ensure ng build produced a dist bundle with index.html.");
+            embeddedAssetsRefreshed = embedded;
+            if (preferredFrontendTarget === "VanillaJS" && !embedded) {
+                throw new errors_1.VerifyError("Unable to embed VanillaJS browser output. Ensure src/index.html and src/main.js produced a browser bundle.");
+            }
+            if (preferredFrontendTarget === "VanillaTS" && !embedded) {
+                throw new errors_1.VerifyError("Unable to embed VanillaTS browser output. Ensure the widget frontend build produced dist/browser with index.html.");
+            }
+            if (shouldRunAngularBuild && !embedded) {
+                throw new errors_1.VerifyError("Unable to embed browser output. Ensure the browser build produced a dist bundle with index.html.");
             }
         }
         let designerPluginBuilt = false;
@@ -246,7 +289,11 @@ function runBuild(cwd, designerPlugin = false) {
                 designerPluginBuilt = true;
             }
         }
-        if (!generationTargets.emitAngularService && !generationTargets.emitQWidget && !generationTargets.emitNodeExpressWs) {
+        if (!generationTargets.emitAngularService
+            && !generationTargets.emitVanillaTS
+            && !generationTargets.emitVanillaJS
+            && !generationTargets.emitQWidget
+            && !generationTargets.emitNodeExpressWs) {
             return {
                 success: true,
                 message: [
@@ -260,15 +307,27 @@ function runBuild(cwd, designerPlugin = false) {
         const detailLines = [];
         if (generationTargets.emitAngularService) {
             detailLines.push("    Target AngularService:");
-            detailLines.push(`      - Services output: ${(0, layout_1.toProjectRelative)(cwd, node_path_1.default.join(layout.frontendRoot, "services"))}`);
-            detailLines.push(`      - Types output: ${(0, layout_1.toProjectRelative)(cwd, node_path_1.default.join(layout.frontendRoot, "types"))}`);
+            detailLines.push(`      - Services output: ${(0, layout_1.toProjectRelative)(cwd, node_path_1.default.join(layout.angularFrontendRoot, "services"))}`);
+            detailLines.push(`      - Types output: ${(0, layout_1.toProjectRelative)(cwd, node_path_1.default.join(layout.angularFrontendRoot, "types"))}`);
+        }
+        if (generationTargets.emitVanillaTS) {
+            detailLines.push("    Target VanillaTS:");
+            detailLines.push(`      - Browser bundle root: ${(0, layout_1.toProjectRelative)(cwd, layout.vanillaTsFrontendRoot)}`);
+            detailLines.push(`      - Browser global: window.AnQstGenerated.${parsed.widgetName}`);
+        }
+        if (generationTargets.emitVanillaJS) {
+            detailLines.push("    Target VanillaJS:");
+            detailLines.push(`      - Browser bundle root: ${(0, layout_1.toProjectRelative)(cwd, layout.vanillaJsFrontendRoot)}`);
+            detailLines.push(`      - Browser global: window.AnQstGenerated.${parsed.widgetName}`);
         }
         if (generationTargets.emitQWidget) {
             detailLines.push("    Target QWidget:");
             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");
-            detailLines.push("      - Embedded web assets refreshed from Angular build");
+            if (embeddedAssetsRefreshed) {
+                detailLines.push("      - Embedded web assets refreshed from detected browser dist output");
+            }
         }
         if (generationTargets.emitNodeExpressWs) {
             detailLines.push("    Target node_express_ws:");
@@ -436,6 +495,8 @@ function toGenerationTargets(targets) {
     return {
         emitQWidget: targets.includes("QWidget"),
         emitAngularService: targets.includes("AngularService"),
+        emitVanillaTS: targets.includes("VanillaTS"),
+        emitVanillaJS: targets.includes("VanillaJS"),
         emitNodeExpressWs: targets.includes("node_express_ws")
     };
 }
@@ -452,7 +513,9 @@ function runClean(pathArg, force) {
     const context = (0, project_1.resolveAnQstSettings)(targetRoot);
     const layout = (0, layout_1.resolveGeneratedLayoutPaths)(targetRoot, context.settings.widgetName);
     const widgetDirs = [
-        (0, layout_1.normalizeSlashes)(node_path_1.default.relative(targetRoot, layout.frontendRoot)),
+        (0, layout_1.normalizeSlashes)(node_path_1.default.relative(targetRoot, layout.angularFrontendRoot)),
+        (0, layout_1.normalizeSlashes)(node_path_1.default.relative(targetRoot, layout.vanillaTsFrontendRoot)),
+        (0, layout_1.normalizeSlashes)(node_path_1.default.relative(targetRoot, layout.vanillaJsFrontendRoot)),
         (0, layout_1.normalizeSlashes)(node_path_1.default.relative(targetRoot, layout.nodeExpressRoot)),
         (0, layout_1.normalizeSlashes)(node_path_1.default.relative(targetRoot, layout.cppQtWidgetRoot)),
         (0, layout_1.normalizeSlashes)(node_path_1.default.relative(targetRoot, layout.cppCmakeRoot)),

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

@@ -128,8 +128,10 @@ class BoundaryTransportAnalyzer {
         const out = new Map();
         for (const decl of this.spec.namespaceTypeDecls)
             out.set(decl.name, decl);
-        for (const decl of this.spec.importedTypeDecls.values())
-            out.set(decl.name, decl);
+        for (const decl of this.spec.importedTypeDecls.values()) {
+            if (!out.has(decl.name))
+                out.set(decl.name, decl);
+        }
         return [...out.values()];
     }
     nodeMeta(typeText, path, identityParts) {