@dusted/anqst 1.5.0 → 1.6.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

@@ -19,6 +19,12 @@ const project_1 = require("./project");
 const layout_1 = require("./layout");
 const parser_1 = require("./parser");
 const verify_1 = require("./verify");
+class CliUsageError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = "CliUsageError";
+    }
+}
 const ANQSTGEN_ACTIVE_STAMP_FILE = ".anqstgen-version-active.json";
 function renderHelp() {
     const version = readActiveBuildStamp();
@@ -59,7 +65,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);
@@ -78,15 +90,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}.`);
@@ -94,7 +110,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`;
@@ -211,8 +231,8 @@ 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 && 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",
@@ -224,8 +244,8 @@ function runBuild(cwd, designerPlugin = false) {
         }
         if (generationTargets.emitQWidget) {
             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.");
+            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;
@@ -240,7 +260,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: [
@@ -254,15 +278,25 @@ 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.widgets.${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.widgets.${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");
+            detailLines.push("      - Embedded web assets refreshed from detected browser dist output");
         }
         if (generationTargets.emitNodeExpressWs) {
             detailLines.push("    Target node_express_ws:");
@@ -296,12 +330,12 @@ function parseSpecCommandArg(commandName, specArg, extraArgs) {
     const positional = [];
     for (const arg of allArgs) {
         if (arg.startsWith("-")) {
-            throw new Error(`Unknown ${commandName} flag '${arg}'. ${usageFor(commandName)}`);
+            throw new CliUsageError(`Unknown ${commandName} flag '${arg}'. ${usageFor(commandName)}`);
         }
         positional.push(arg);
     }
     if (positional.length !== 1) {
-        throw new Error(usageFor(commandName));
+        throw new CliUsageError(usageFor(commandName));
     }
     return positional[0];
 }
@@ -328,12 +362,12 @@ function parseBuildCommandArgs(specArg, extraArgs) {
             continue;
         }
         if (arg.startsWith("-")) {
-            throw new Error(`Unknown build flag '${arg}'. ${usageFor("build")}`);
+            throw new CliUsageError(`Unknown build flag '${arg}'. ${usageFor("build")}`);
         }
         positional.push(arg);
     }
     if (positional.length > 0) {
-        throw new Error(`Unexpected extra argument '${positional[0]}'. ${usageFor("build")}`);
+        throw new CliUsageError(`Unexpected extra argument '${positional[0]}'. ${usageFor("build")}`);
     }
     return { designerPlugin };
 }
@@ -347,15 +381,15 @@ function parseCleanCommandArgs(specArg, extraArgs) {
             continue;
         }
         if (arg.startsWith("-")) {
-            throw new Error(`Unknown clean flag '${arg}'. Use -f or --force.`);
+            throw new CliUsageError(`Unknown clean flag '${arg}'. Use -f or --force.`);
         }
         if (targetPathArg !== null) {
-            throw new Error(`Unexpected extra argument '${arg}'. Usage: anqst clean <path> [-f|--force]`);
+            throw new CliUsageError(`Unexpected extra argument '${arg}'. Usage: anqst clean <path> [-f|--force]`);
         }
         targetPathArg = arg;
     }
     if (targetPathArg === null) {
-        throw new Error("Usage: anqst clean <path> [-f|--force]");
+        throw new CliUsageError("Usage: anqst clean <path> [-f|--force]");
     }
     return { targetPathArg, force };
 }
@@ -430,6 +464,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")
     };
 }
@@ -446,7 +482,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)),
@@ -476,6 +514,19 @@ function renderInstallAliasMessage() {
         return text;
     return `\x1b[38;5;214m${text}\x1b[0m`;
 }
+function formatUnexpectedError(error) {
+    if (!(error instanceof Error)) {
+        return `[AnQst] ${String(error)}`;
+    }
+    const lines = [`[AnQst] ${error.message}`];
+    const stack = typeof error.stack === "string" ? error.stack.trim() : "";
+    if (stack.length > 0) {
+        lines.push("");
+        lines.push("Stack trace:");
+        lines.push(stack);
+    }
+    return lines.join("\n");
+}
 function runCommand(command, specArg, extraArgs = []) {
     try {
         if (!command) {
@@ -545,8 +596,11 @@ function runCommand(command, specArg, extraArgs = []) {
             console.error((0, errors_1.formatVerifyError)(error));
             return 1;
         }
-        const message = error instanceof Error ? error.message : String(error);
-        console.error(`[AnQst] ${message}`);
+        if (error instanceof CliUsageError) {
+            console.error(error.message);
+            return 1;
+        }
+        console.error(formatUnexpectedError(error));
         return 1;
     }
 }

package/dist/src/base93.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BASE93_ALPHABET = void 0;
 exports.emitBase93Encoder = emitBase93Encoder;
 exports.emitBase93Decoder = emitBase93Decoder;
-exports.emitBase93CppFunctions = emitBase93CppFunctions;
 exports.BASE93_ALPHABET = Array.from({ length: 95 }, (_, i) => String.fromCharCode(0x20 + i))
     .filter(c => c !== '"' && c !== '\\')
     .join('');
@@ -51,74 +50,3 @@ for (i = r - 2; i >= 0; i--) { o[p + i] = v & 255; v = (v / 256) | 0; }
 return o;
 }`;
 }
-function emitBase93CppFunctions() {
-    return `inline int base93AlphabetIndex(char c) {
-  const unsigned char uc = static_cast<unsigned char>(c);
-  return static_cast<int>(uc) - 32 - (uc > 34) - (uc > 92);
-}
-
-inline std::string base93Encode(const std::vector<std::uint8_t>& d) {
-  static constexpr char A[] = "${exports.BASE93_ALPHABET}";
-  const std::size_t n = d.size();
-  const std::size_t f = n >> 2;
-  const std::size_t r = n & 3;
-  std::string o(f * 5 + (r ? r + 1 : 0), '\\0');
-  std::size_t p = 0;
-  for (std::size_t i = 0; i < f; ++i) {
-    const std::size_t b = i << 2;
-    std::uint32_t v =
-      (static_cast<std::uint32_t>(d[b]) << 24) |
-      (static_cast<std::uint32_t>(d[b + 1]) << 16) |
-      (static_cast<std::uint32_t>(d[b + 2]) << 8) |
-      static_cast<std::uint32_t>(d[b + 3]);
-    o[p + 4] = A[v % 93u]; v /= 93u;
-    o[p + 3] = A[v % 93u]; v /= 93u;
-    o[p + 2] = A[v % 93u]; v /= 93u;
-    o[p + 1] = A[v % 93u];
-    o[p] = A[v / 93u];
-    p += 5;
-  }
-  if (r) {
-    const std::size_t b = f << 2;
-    std::uint32_t v = 0;
-    for (std::size_t j = 0; j < r; ++j) v = (v << 8) | d[b + j];
-    for (std::size_t j = r + 1; j-- > 0;) {
-      o[p + j] = A[v % 93u];
-      v /= 93u;
-    }
-  }
-  return o;
-}
-
-inline std::vector<std::uint8_t> base93Decode(const std::string& s) {
-  const std::size_t n = s.size();
-  const std::size_t f = n / 5;
-  const std::size_t r = n - f * 5;
-  std::vector<std::uint8_t> o(f * 4 + (r ? r - 1 : 0));
-  std::size_t p = 0;
-  for (std::size_t i = 0; i < f; ++i) {
-    const std::size_t b = i * 5;
-    std::uint32_t v = static_cast<std::uint32_t>(base93AlphabetIndex(s[b]));
-    v = v * 93u + static_cast<std::uint32_t>(base93AlphabetIndex(s[b + 1]));
-    v = v * 93u + static_cast<std::uint32_t>(base93AlphabetIndex(s[b + 2]));
-    v = v * 93u + static_cast<std::uint32_t>(base93AlphabetIndex(s[b + 3]));
-    v = v * 93u + static_cast<std::uint32_t>(base93AlphabetIndex(s[b + 4]));
-    o[p] = static_cast<std::uint8_t>(v >> 24);
-    o[p + 1] = static_cast<std::uint8_t>((v >> 16) & 255u);
-    o[p + 2] = static_cast<std::uint8_t>((v >> 8) & 255u);
-    o[p + 3] = static_cast<std::uint8_t>(v & 255u);
-    p += 4;
-  }
-  if (r) {
-    std::uint32_t v = 0;
-    for (std::size_t i = 0; i < r; ++i) {
-      v = v * 93u + static_cast<std::uint32_t>(base93AlphabetIndex(s[f * 5 + i]));
-    }
-    for (std::size_t i = r - 1; i-- > 0;) {
-      o[p + i] = static_cast<std::uint8_t>(v & 255u);
-      v /= 256u;
-    }
-  }
-  return o;
-}`;
-}