@fluid-app/fluid-cli-theme-dev 0.1.11 → 0.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-app/fluid-cli-theme-dev",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "description": "Fluid CLI plugin for theme developer workflows — dev server, push, pull, init",
   "type": "module",
   "main": "./dist/index.mjs",
@@ -30,9 +30,10 @@
     "@types/prompts": "^2.4.9",
     "tsdown": "^0.21.0",
     "typescript": "^5",
-    "@fluid-app/typescript-config": "0.0.0",
     "@fluid-app/api-client-core": "0.1.0",
-    "@fluid-app/themes-api-client": "0.1.0"
+    "@fluid-app/theme-schema": "0.1.0",
+    "@fluid-app/themes-api-client": "0.1.0",
+    "@fluid-app/typescript-config": "0.0.0"
   },
   "engines": {
     "node": ">=18.0.0"

package/src/commands/dev.ts

@@ -147,7 +147,7 @@ export function createDevCommand(): Command {
             editorUrl,
           },
           themeRoot,
-          { host: opts.host, port, reloadMode },
+          { host: opts.host, port, reloadMode, validate: !opts.force },
           (address) => {
             console.log(`\n  Dev server: ${address}`);
             console.log(`  Web editor: ${editorUrl}`);

package/src/commands/push.ts

@@ -177,12 +177,19 @@ export function createPushCommand(): Command {
 
         const result = await syncer.uploadTheme({
           delete: !opts.nodelete,
+          validate: !opts.force,
           onProgress: (d, total) => {
             spinner.text = `Pushing ${d}/${total} files…`;
           },
         });
 
-        if (result.errors.length) {
+        if (result.validationFailed) {
+          spinner.fail(
+            `Schema validation failed (${result.errors.length} error(s)). Use --force to skip.`,
+          );
+          for (const e of result.errors) console.error(`  ${e}`);
+          process.exit(1);
+        } else if (result.errors.length) {
           spinner.warn(`Pushed with ${result.errors.length} error(s).`);
           for (const e of result.errors) console.error(`  ${e}`);
         } else {

package/src/theme/dev-server/index.ts

@@ -23,7 +23,7 @@ export async function startDevServer(
   api: ApiClient,
   theme: DevServerTheme,
   themeRoot: ThemeRoot,
-  opts: DevServerOptions,
+  opts: DevServerOptions & { validate?: boolean },
   onReady?: (address: string) => void,
 ): Promise<() => void> {
   const sse = new SSEStream();
@@ -33,13 +33,23 @@ export async function startDevServer(
 
   // ── Initial sync ─────────────────────────────────────────────────────────
   console.log(`\nSyncing theme ${theme.name} (#${theme.id})…`);
-  await syncer.uploadTheme({
+  const syncResult = await syncer.uploadTheme({
     delete: true,
+    validate: opts.validate,
     onProgress: (done, total) => {
       process.stdout.write(`\r  Uploading ${done}/${total} files…`);
     },
   });
   process.stdout.write("\n");
+  if (syncResult.validationFailed) {
+    console.error(
+      `\nSchema validation failed (${syncResult.errors.length} error(s)). Use --force to skip.\n`,
+    );
+    for (const e of syncResult.errors) console.error(`  ${e}`);
+    process.exit(1);
+  } else if (syncResult.errors.length > 0) {
+    for (const e of syncResult.errors) console.error(`  ${e}`);
+  }
 
   // ── File watcher ─────────────────────────────────────────────────────────
   const stopWatcher = watchTheme(
@@ -48,6 +58,16 @@ export async function startDevServer(
       const changed = [...modified, ...added];
 
       for (const file of changed) {
+        // Validate schema on liquid files during dev (warn, don't block)
+        if (opts.validate && file.isLiquid) {
+          const diagnostics = file.validateSchema();
+          for (const d of diagnostics) {
+            const prefix =
+              d.severity === "error" ? "Schema error" : "Schema warning";
+            console.warn(`\n[${prefix}] ${file.relativePath}: ${d.message}`);
+          }
+        }
+
         pendingUpdates.add(file.relativePath);
         try {
           await syncer.uploadFile(file);

package/src/theme/file.ts

@@ -8,6 +8,11 @@ import {
 import { extname, basename, relative, dirname } from "node:path";
 import { createHash } from "node:crypto";
 import { mimeTypeFor, type MimeType } from "./mime-type.js";
+import {
+  validateSchemaText,
+  type Diagnostic,
+  type BlocksSchemaType,
+} from "@fluid-app/theme-schema";
 
 export class ThemeFile {
   readonly absolutePath: string;
@@ -65,4 +70,27 @@ export class ThemeFile {
   size(): number {
     return statSync(this.absolutePath).size;
   }
+
+  get isTemplate(): boolean {
+    // Template files (home_page, product, etc.) expect blocks as objects.
+    // Section files expect blocks as arrays.
+    const parts = this.relativePath.split(/[/\\]/);
+    return (
+      parts[0] === "templates" &&
+      parts.length >= 3 &&
+      parts[1] !== "sections" &&
+      parts[1] !== "blocks" &&
+      parts[1] !== "components"
+    );
+  }
+
+  validateSchema(): Diagnostic[] {
+    if (!this.isLiquid) return [];
+
+    const blocksSchemaType: BlocksSchemaType = this.isTemplate
+      ? "object"
+      : "array";
+
+    return validateSchemaText(this.read(), { blocksSchemaType });
+  }
 }

package/src/theme/syncer.ts

@@ -11,6 +11,7 @@ export interface SyncResult {
   downloaded: number;
   deleted: number;
   errors: string[];
+  validationFailed: boolean;
 }
 
 export class Syncer {
@@ -201,6 +202,7 @@ export class Syncer {
   async uploadTheme(
     opts: {
       delete?: boolean;
+      validate?: boolean;
       onProgress?: (done: number, total: number) => void;
     } = {},
   ): Promise<SyncResult> {
@@ -212,8 +214,25 @@ export class Syncer {
       deleted: 0,
       downloaded: 0,
       errors: [],
+      validationFailed: false,
     };
 
+    // Schema validation pass
+    if (opts.validate) {
+      for (const file of localFiles) {
+        if (!file.isLiquid) continue;
+        const diagnostics = file.validateSchema();
+        const errors = diagnostics.filter((d) => d.severity === "error");
+        for (const d of errors) {
+          result.errors.push(`${file.relativePath}: ${d.message}`);
+        }
+      }
+      if (result.errors.length > 0) {
+        result.validationFailed = true;
+        return result;
+      }
+    }
+
     const toUpload = localFiles.filter((f) => f.exists && this.hasChanged(f));
     let done = 0;
     for (const file of toUpload) {
@@ -258,6 +277,7 @@ export class Syncer {
       downloaded: 0,
       skipped: 0,
       errors: [],
+      validationFailed: false,
     };
 
     let done = 0;