icuewidget-cli 0.4.47 → 0.4.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "icuewidget-cli",
-  "version": "0.4.47",
+  "version": "0.4.48",
   "description": "Create, validate, update, and package CORSAIR iCUE widgets.",
   "keywords": [
     "corsair",

package/src-node/cli.js

@@ -19,6 +19,8 @@ import { notifyAboutUpdate, runUpdateCheckWorker } from "./update-check.js";
 import { ValidationError, validateWidget } from "./validation.js";
 import { createPackage } from "./zip.js";
 
+const COMMANDS = ["init", "validate", "update", "package"];
+
 export async function main(argv = process.argv) {
   try {
     const args = argv.slice(2);
@@ -30,7 +32,9 @@ export async function main(argv = process.argv) {
       printHelp();
       return;
     }
-    if (has(args, "--version") || has(args, "-v")) {
+    // `update <widget> --version <semver>` uses --version as a subcommand option, so only
+    // treat it as the global flag when no subcommand leads the argument list.
+    if (!COMMANDS.includes(args[0]) && (has(args, "--version") || has(args, "-v"))) {
       console.log(CLI_VERSION);
       return;
     }

package/src-node/constants.js

@@ -1,6 +1,6 @@
 export const APP_NAME = "icuewidget";
 export const NPM_PACKAGE_NAME = "icuewidget-cli";
-export const CLI_VERSION = "0.4.47";
+export const CLI_VERSION = "0.4.48";
 export const DEFAULT_APP_VERSION = "5.45";
 export const DEFAULT_FRAMEWORK_VERSION = "1.0.0";
 export const DEFAULT_PLATFORM = "windows";

package/src-node/prompts.js

@@ -10,10 +10,30 @@ function reader() {
 
 export async function prompt(label, defaultValue = "") {
   const suffix = defaultValue ? ` (${defaultValue})` : "";
-  const answer = (await reader().question(`${label}${suffix}: `)).trim();
+  const answer = (await ask(`${label}${suffix}: `, label)).trim();
   return answer || defaultValue;
 }
 
+// readline never settles a pending question when stdin ends (closed pipe, CI, /dev/null), so
+// Node would exit 0 with the command half-run. Reject instead so the failure is visible.
+function ask(question, label) {
+  const rl = reader();
+  return new Promise((resolve, reject) => {
+    const onClose = () => reject(new Error(`Input ended while waiting for "${label}". Pass the value as a flag or run interactively.`));
+    rl.once("close", onClose);
+    rl.question(question).then(
+      (answer) => {
+        rl.off("close", onClose);
+        resolve(answer);
+      },
+      (error) => {
+        rl.off("close", onClose);
+        reject(error);
+      },
+    );
+  });
+}
+
 export async function promptValidated(label, defaultValue, validator, errorMessage) {
   while (true) {
     const answer = await prompt(label, defaultValue);

package/src-node/validation.js

@@ -23,7 +23,7 @@ export async function validateWidget(widgetDir) {
     }
   }
 
-  const manifest = await validateManifest(root);
+  const manifest = await validateManifest(root, warnings);
   if (await pathExists(path.join(root, "translation.json"))) {
     await readJson(path.join(root, "translation.json"));
   } else {
@@ -34,7 +34,7 @@ export async function validateWidget(widgetDir) {
   return { widgetDir: root, manifest, warnings };
 }
 
-async function validateManifest(root) {
+async function validateManifest(root, warnings) {
   const manifest = await readJson(path.join(root, "manifest.json"));
   if (!manifest || typeof manifest !== "object" || Array.isArray(manifest)) {
     throw new ValidationError("manifest.json must contain a JSON object");
@@ -78,6 +78,18 @@ async function validateManifest(root) {
   if (manifest.interactive !== undefined && typeof manifest.interactive !== "boolean") {
     throw new ValidationError("manifest.interactive must be a boolean when provided");
   }
+  if (manifest.interactive === true) {
+    const nonDashboardTypes = manifest.supported_devices
+      .map((d) => d.type)
+      .filter((t) => t !== "dashboard_lcd");
+    if (nonDashboardTypes.length > 0) {
+      warnings.push(
+        `manifest.interactive is true, but supported_devices includes ${nonDashboardTypes.join(", ")}. ` +
+          `iCUE only recognizes interactive widgets on dashboard_lcd (Xeneon Edge). ` +
+          `The widget will not appear for ${nonDashboardTypes.join(" or ")} devices.`
+      );
+    }
+  }
   if (manifest.required_plugins !== undefined) validateStringArray(manifest.required_plugins, "manifest.required_plugins");
   if (manifest.modules !== undefined) {
     validateStringArray(manifest.modules, "manifest.modules");
@@ -91,19 +103,23 @@ async function validateIndex(root, warnings) {
   const html = await fs.readFile(path.join(root, "index.html"), "utf8");
   if (!/<title>[^<]+<\/title>/i.test(html)) warnings.push("index.html does not define a <title>.");
   if (!/rel=["'][^"']*icon/i.test(html)) warnings.push("index.html does not reference a favicon/icon.");
-  if (!html.includes("icueEvents")) warnings.push("index.html or scripts do not reference icueEvents.");
 
   validateHeadWellFormed(html);
   validatePropertyTypes(html);
   validatePropertyGroups(html);
 
+  let referencesIcueEvents = html.includes("icueEvents");
   const assetRefs = [...extractAttributes(html, "href"), ...extractAttributes(html, "src")];
   for (const ref of assetRefs) {
     if (isRemote(ref) || ref.startsWith("data:") || ref.startsWith("#")) continue;
     await validateRelativeFile(root, stripQuery(ref), `index.html asset reference ${ref}`);
     if (ref.endsWith(".css")) await validateCss(path.join(root, stripQuery(ref)));
-    if (ref.endsWith(".js")) await validateJs(path.join(root, stripQuery(ref)));
+    if (ref.endsWith(".js")) {
+      const code = await validateJs(path.join(root, stripQuery(ref)));
+      if (code.includes("icueEvents")) referencesIcueEvents = true;
+    }
   }
+  if (!referencesIcueEvents) warnings.push("index.html or scripts do not reference icueEvents.");
 }
 
 // iCUE imports a widget by parsing <head> with a strict XML parser (Qt QDomDocument).
@@ -215,6 +231,7 @@ async function validateJs(filePath) {
   } catch (error) {
     throw new ValidationError(`${path.basename(filePath)} has invalid JavaScript: ${error.message}`);
   }
+  return code;
 }
 
 async function validateRelativeFile(root, relativePath, label) {