@glasshome/widget-cli 0.13.3 → 0.13.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glasshome/widget-cli",
-  "version": "0.13.3",
+  "version": "0.13.4",
   "description": "CLI for creating and managing GlassHome widgets",
   "type": "module",
   "bin": {
@@ -18,7 +18,7 @@
   ],
   "devDependencies": {
     "@iconify/types": "^2.0.0",
-    "@types/bun": "latest",
+    "@types/bun": "^1.4.0",
     "@types/semver": "^7.0.0",
     "playwright": "^1.40.0",
     "typescript": "^7.0.2"
@@ -30,7 +30,7 @@
     "@fontsource-variable/geist-mono": "^5.2.8",
     "@glasshome/sync-layer": "0.8.1",
     "@glasshome/widget-contract": "0.2.1",
-    "@glasshome/widget-sdk": "1.14.3",
+    "@glasshome/widget-sdk": "1.15.1",
     "@iconify-json/lucide": "^1.2.0",
     "@iconify-json/mdi": "^1.2.3",
     "@tailwindcss/vite": "^4.1.13",

package/src/commands/add.ts

@@ -1,6 +1,7 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { resolve } from "node:path";
-import { cancel, isCancel, log, text } from "@clack/prompts";
+import { cancel, log, text } from "@clack/prompts";
+import { cancelled } from "../utils/prompt";
 import { defaultSdkRange, FALLBACK_SDK_RANGE } from "../utils/sdk-version";
 
 /** Capitalize kebab-case into PascalCase for component names. */
@@ -77,7 +78,7 @@ export async function promptWidgetDetails(defaults?: { widgetName?: string }): P
         return "Name must be lowercase alphanumeric with optional hyphens";
     },
   });
-  if (isCancel(widgetName)) {
+  if (cancelled(widgetName)) {
     cancel("Operation cancelled.");
     return null;
   }
@@ -87,14 +88,14 @@ export async function promptWidgetDetails(defaults?: { widgetName?: string }): P
     placeholder: "A GlassHome dashboard widget",
     defaultValue: "",
   });
-  if (isCancel(description)) {
+  if (cancelled(description)) {
     cancel("Operation cancelled.");
     return null;
   }
 
   return {
-    widgetName: widgetName as string,
-    description: description as string,
+    widgetName,
+    description,
   };
 }
 

package/src/commands/create.ts

@@ -9,8 +9,9 @@ import {
   writeFileSync,
 } from "node:fs";
 import { dirname, join, resolve } from "node:path";
-import { cancel, confirm, isCancel, log, note, spinner, text } from "@clack/prompts";
+import { cancel, confirm, log, note, spinner, text } from "@clack/prompts";
 import color from "picocolors";
+import { cancelled } from "../utils/prompt";
 import { defaultSdkRange, FALLBACK_SDK_RANGE } from "../utils/sdk-version";
 import { getCliVersion } from "../utils/version";
 import { promptWidgetDetails, scaffoldWidget } from "./add";
@@ -59,7 +60,7 @@ export async function runCreate() {
     },
   });
 
-  if (isCancel(projectName)) {
+  if (cancelled(projectName)) {
     cancel("Operation cancelled.");
     process.exit(0);
   }
@@ -70,7 +71,7 @@ export async function runCreate() {
     defaultValue: "",
   });
 
-  if (isCancel(projectDescription)) {
+  if (cancelled(projectDescription)) {
     cancel("Operation cancelled.");
     process.exit(0);
   }
@@ -80,7 +81,7 @@ export async function runCreate() {
   const widgetDetails = await promptWidgetDetails();
   if (!widgetDetails) process.exit(0);
 
-  const targetDir = resolve(process.cwd(), projectName as string);
+  const targetDir = resolve(process.cwd(), projectName);
 
   if (existsSync(targetDir)) {
     cancel(`Directory "${projectName}" already exists.`);
@@ -115,7 +116,7 @@ export async function runCreate() {
     }
 
     const projectDesc =
-      (projectDescription as string) || `A GlassHome widget project: ${projectName}`;
+      projectDescription || `A GlassHome widget project: ${projectName}`;
 
     // Replace project-level placeholders in package.json. Pin the CLI to the
     // version that scaffolded the project (caret) so `bun widget` resolves the
@@ -123,7 +124,7 @@ export async function runCreate() {
     // stale global/bunx copy.
     const pkgPath = join(targetDir, "package.json");
     let pkgContent = readFileSync(pkgPath, "utf-8");
-    pkgContent = pkgContent.replace(/PROJECT_NAME/g, projectName as string);
+    pkgContent = pkgContent.replace(/PROJECT_NAME/g, projectName);
     pkgContent = pkgContent.replace(/PROJECT_DESCRIPTION/g, projectDesc);
     pkgContent = pkgContent.replace(/CLI_VERSION/g, `^${getCliVersion()}`);
     // Nothing is installed yet, so this comes from the SDK the CLI ships
@@ -134,7 +135,7 @@ export async function runCreate() {
     // Replace project-level placeholders in README.md
     const readmePath = join(targetDir, "README.md");
     let readmeContent = readFileSync(readmePath, "utf-8");
-    readmeContent = readmeContent.replace(/PROJECT_NAME/g, projectName as string);
+    readmeContent = readmeContent.replace(/PROJECT_NAME/g, projectName);
     readmeContent = readmeContent.replace(/PROJECT_DESCRIPTION/g, projectDesc);
     writeFileSync(readmePath, readmeContent);
 
@@ -153,7 +154,7 @@ export async function runCreate() {
       initialValue: true,
     });
 
-    if (!isCancel(shouldInstall) && shouldInstall) {
+    if (!cancelled(shouldInstall) && shouldInstall) {
       const installSpinner = spinner();
       installSpinner.start("Installing dependencies...");
       const installProc = Bun.spawnSync(["bun", "install"], { cwd: installCwd });
@@ -179,7 +180,7 @@ export async function runCreate() {
         initialValue: true,
       });
 
-      if (!isCancel(shouldGit) && shouldGit) {
+      if (!cancelled(shouldGit) && shouldGit) {
         const gitSpinner = spinner();
         gitSpinner.start("Initializing git repository...");
         const initProc = Bun.spawnSync(["git", "init"], { cwd: targetDir });
@@ -201,7 +202,7 @@ export async function runCreate() {
       steps.push(color.cyan(`cd ${projectName}`));
     } else {
       steps.push(color.cyan(`cd ${projectName}`));
-      if (isCancel(shouldInstall) || !shouldInstall) steps.push(color.cyan("bun install"));
+      if (cancelled(shouldInstall) || !shouldInstall) steps.push(color.cyan("bun install"));
     }
     steps.push(cmd("bun widget connect <url>", "connect to a dashboard for live testing"));
     steps.push(cmd("bun widget add", "add another widget"));

package/src/commands/publish.ts

@@ -1,10 +1,11 @@
 import { createHash } from "node:crypto";
 import { existsSync, readFileSync } from "node:fs";
 import { resolve } from "node:path";
-import { cancel, isCancel, log, select, spinner } from "@clack/prompts";
+import { cancel, log, select, spinner } from "@clack/prompts";
 import semver from "semver";
 import { getHubUrl, getToken } from "../utils/auth";
 import { confirmPublish, fetchScopes, requestPublish, uploadToR2 } from "../utils/hub-api";
+import { cancelled } from "../utils/prompt";
 import {
   discoverWidgets,
   formatBytes,
@@ -84,12 +85,12 @@ export async function runPublish(
       })),
     });
 
-    if (isCancel(choice)) {
+    if (cancelled(choice)) {
       cancel("Publish cancelled.");
       process.exit(0);
     }
 
-    scope = choice as string;
+    scope = choice;
   }
 
   // Step 4: Select widget
@@ -121,11 +122,11 @@ export async function runPublish(
       options: widgetOptions,
     });
 
-    if (isCancel(selected)) {
+    if (cancelled(selected)) {
       cancel("Publish cancelled.");
       process.exit(0);
     }
-    widgetName = selected as string;
+    widgetName = selected;
   }
 
   const manifest = readManifest(cwd, widgetName);
@@ -148,11 +149,11 @@ export async function runPublish(
       ],
     });
 
-    if (isCancel(choice)) {
+    if (cancelled(choice)) {
       cancel("Publish cancelled.");
       process.exit(0);
     }
-    bump = choice as string;
+    bump = choice;
   }
 
   let version = currentVersion;

package/src/utils/prompt.ts

@@ -0,0 +1,9 @@
+import { isCancel } from "@clack/prompts";
+
+/**
+ * `isCancel` is typed `value is typeof CANCEL_SYMBOL` while the prompts return
+ * `string | symbol`, so excluding one unique symbol narrows nothing.
+ */
+export function cancelled(value: unknown): value is symbol {
+  return isCancel(value);
+}