@glasshome/widget-cli 0.3.0 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glasshome/widget-cli",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "CLI for creating and managing GlassHome widgets",
   "type": "module",
   "bin": {

package/src/commands/info.ts

@@ -44,8 +44,8 @@ export async function runInfo(cwd: string, widgetName?: string): Promise<void> {
       const manifest = readManifest(cwd, name);
       log.info(`  Tag:         ${manifest.tag}`);
       log.info(`  Name:        ${manifest.name}`);
-      log.info(`  Type:        ${manifest.type}`);
-      log.info(`  Size:        ${manifest.size}`);
+      log.info(`  Min Size:    ${manifest.minSize.w}×${manifest.minSize.h}`);
+      log.info(`  Max Size:    ${manifest.maxSize.w}×${manifest.maxSize.h}`);
       log.info(`  SDK Version: ${manifest.sdkVersion}`);
       if (manifest.version) {
         log.info(`  Version:     ${manifest.version}`);

package/src/commands/publish.ts

@@ -161,6 +161,7 @@ export async function runPublish(cwd: string, hubUrlOverride?: string): Promise<
       name: widgetName,
       displayName: manifest.name,
       description: manifest.description,
+      icon: manifest.icon,
       minSize: manifest.minSize,
       maxSize: manifest.maxSize,
       sdkVersion: manifest.sdkVersion,

package/src/commands/validate.ts

@@ -1,6 +1,7 @@
 import { existsSync } from "node:fs";
 import { resolve } from "node:path";
 import { log, spinner } from "@clack/prompts";
+import { WidgetManifestSchema } from "@glasshome/widget-sdk/schemas";
 import {
   discoverWidgets,
   formatBytes,
@@ -22,54 +23,43 @@ function validateManifest(manifest: WidgetManifest): ValidationResult {
   const errors: string[] = [];
   const warnings: string[] = [];
 
-  // Required fields
-  if (!manifest.tag) errors.push("Missing required field: tag");
-  if (!manifest.name) errors.push("Missing required field: name");
-  if (!manifest.sdkVersion) errors.push("Missing required field: sdkVersion");
+  // Validate core manifest shape using the shared schema
+  const result = WidgetManifestSchema.safeParse(manifest);
+  if (!result.success) {
+    for (const issue of result.error.issues) {
+      const path = issue.path.length > 0 ? issue.path.join(".") : "manifest";
+      errors.push(`${path}: ${issue.message}`);
+    }
+  }
 
-  // Tag format
+  // Tag format (stricter than schema — enforces kebab-case with at least one hyphen)
   if (manifest.tag && !TAG_REGEX.test(manifest.tag)) {
     errors.push(
       `Invalid tag format "${manifest.tag}" — must match ${TAG_REGEX} (e.g. glasshome-my-widget)`,
     );
   }
 
-  // minSize validation
-  if (
-    !manifest.minSize ||
-    typeof manifest.minSize !== "object" ||
-    typeof manifest.minSize.w !== "number" ||
-    typeof manifest.minSize.h !== "number"
-  ) {
-    errors.push("minSize must be an object with numeric w and h properties");
-  }
-
-  // maxSize validation
-  if (
-    !manifest.maxSize ||
-    typeof manifest.maxSize !== "object" ||
-    typeof manifest.maxSize.w !== "number" ||
-    typeof manifest.maxSize.h !== "number"
-  ) {
-    errors.push("maxSize must be an object with numeric w and h properties");
-  }
-
   // Schema validation
   if (manifest.schema) {
     if (typeof manifest.schema !== "object") {
       errors.push("Schema must be an object");
     } else {
-      if (manifest.schema.type !== "object") {
+      if ((manifest.schema as Record<string, unknown>).type !== "object") {
         warnings.push('Schema type should be "object"');
       }
-      if (!manifest.schema.properties || typeof manifest.schema.properties !== "object") {
+      if (
+        !(manifest.schema as Record<string, unknown>).properties ||
+        typeof (manifest.schema as Record<string, unknown>).properties !== "object"
+      ) {
         warnings.push("Schema should have a properties object");
       }
     }
 
     // Check defaultConfig matches schema properties
-    if (manifest.defaultConfig && manifest.schema.properties) {
-      const schemaKeys = Object.keys(manifest.schema.properties as Record<string, unknown>);
+    if (manifest.defaultConfig && (manifest.schema as Record<string, unknown>).properties) {
+      const schemaKeys = Object.keys(
+        (manifest.schema as Record<string, unknown>).properties as Record<string, unknown>,
+      );
       const configKeys = Object.keys(manifest.defaultConfig);
       for (const key of configKeys) {
         if (!schemaKeys.includes(key)) {
@@ -134,7 +124,8 @@ export async function runValidate(
     try {
       manifest = readManifest(cwd, name);
     } catch (err) {
-      if (!quiet) log.error(`  Failed to read manifest: ${err instanceof Error ? err.message : String(err)}`);
+      if (!quiet)
+        log.error(`  Failed to read manifest: ${err instanceof Error ? err.message : String(err)}`);
       failed.push(name);
       allPassed = false;
       continue;

package/src/utils/hub-api.ts

@@ -15,14 +15,16 @@ export async function fetchScopes(hubUrl: string, token: string): Promise<Publis
   return data.scopes;
 }
 
+import type { GridSize } from "@glasshome/widget-sdk";
+
 interface PublishRequestParams {
   scope: string;
   name: string;
   displayName: string;
   description?: string;
   icon?: string;
-  minSize: { w: number; h: number };
-  maxSize: { w: number; h: number };
+  minSize: GridSize;
+  maxSize: GridSize;
   sdkVersion: string;
   version: string;
   bundleSize: number;

package/src/utils/manifest.ts

@@ -1,18 +1,9 @@
 import { existsSync, readdirSync, readFileSync, statSync, writeFileSync } from "node:fs";
 import { join, resolve } from "node:path";
 import { gzipSync } from "node:zlib";
+import type { WidgetManifest as SdkWidgetManifest } from "@glasshome/widget-sdk";
 
-export interface WidgetManifest {
-  tag: string;
-  name: string;
-  minSize: { w: number; h: number };
-  maxSize: { w: number; h: number };
-  sdkVersion: string;
-  version?: string;
-  description?: string;
-  schema?: Record<string, unknown>;
-  defaultConfig?: Record<string, unknown>;
-}
+export type WidgetManifest = SdkWidgetManifest & { version?: string };
 
 export interface Registry {
   version: number;