@fluid-app/fluid-cli-theme-dev 0.1.10 → 0.1.12

package/src/theme/syncer.ts

@@ -11,6 +11,7 @@ export interface SyncResult {
   downloaded: number;
   deleted: number;
   errors: string[];
+  validationFailed: boolean;
 }
 
 export class Syncer {
@@ -46,6 +47,11 @@ export class Syncer {
     return [...this.checksums.keys()];
   }
 
+  /** Snapshot of remote checksums (key → sha256). Available after fetchChecksums() or downloadAll(). */
+  remoteChecksums(): Record<string, string> {
+    return Object.fromEntries(this.checksums);
+  }
+
   // ─── Upload ───────────────────────────────────────────────────────────────
 
   async uploadFile(file: ThemeFile): Promise<void> {
@@ -196,6 +202,7 @@ export class Syncer {
   async uploadTheme(
     opts: {
       delete?: boolean;
+      validate?: boolean;
       onProgress?: (done: number, total: number) => void;
     } = {},
   ): Promise<SyncResult> {
@@ -207,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) {
@@ -242,19 +266,28 @@ export class Syncer {
   async downloadTheme(
     opts: {
       delete?: boolean;
+      skip?: Set<string>;
       onProgress?: (done: number, total: number) => void;
     } = {},
-  ): Promise<SyncResult> {
+  ): Promise<SyncResult & { skipped: number }> {
     const resources = await this.downloadAll();
-    const result: SyncResult = {
+    const result: SyncResult & { skipped: number } = {
       uploaded: 0,
       deleted: 0,
       downloaded: 0,
+      skipped: 0,
       errors: [],
+      validationFailed: false,
     };
 
     let done = 0;
     for (const resource of resources) {
+      if (opts.skip?.has(resource.key)) {
+        result.skipped++;
+        opts.onProgress?.(++done, resources.length);
+        continue;
+      }
+
       const file = this.themeRoot.file(resource.key);
 
       // Guard against path traversal from malicious API responses

package/src/theme-config.ts

@@ -0,0 +1,34 @@
+import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
+
+export interface ThemeConfig {
+  themeId: number;
+  themeName: string;
+  company: string;
+  lastPulledAt: string | null;
+  checksums: Record<string, string>;
+}
+
+const CONFIG_FILE = ".fluid-theme.json";
+
+function configPath(themeRoot: string): string {
+  return join(themeRoot, CONFIG_FILE);
+}
+
+/** Read `.fluid-theme.json` from a theme directory, or null if it doesn't exist. */
+export function readThemeConfig(themeRoot: string): ThemeConfig | null {
+  const path = configPath(themeRoot);
+  if (!existsSync(path)) return null;
+  try {
+    const raw = readFileSync(path, "utf-8");
+    return JSON.parse(raw) as ThemeConfig;
+  } catch {
+    return null;
+  }
+}
+
+/** Write `.fluid-theme.json` to a theme directory. */
+export function writeThemeConfig(themeRoot: string, config: ThemeConfig): void {
+  const path = configPath(themeRoot);
+  writeFileSync(path, JSON.stringify(config, null, 2) + "\n", "utf-8");
+}

package/src/workspace.ts

@@ -0,0 +1,71 @@
+import { existsSync, readFileSync } from "node:fs";
+import { dirname, join, relative, resolve, sep } from "node:path";
+
+export interface FluidWorkspace {
+  /** Absolute path to the workspace root (where .fluid-workspace.json lives) */
+  root: string;
+  /** Parsed workspace config */
+  config: WorkspaceConfig;
+}
+
+interface WorkspaceConfig {
+  type: string;
+  version: number;
+}
+
+const WORKSPACE_FILE = ".fluid-workspace.json";
+
+/**
+ * Walk up from `startDir` looking for `.fluid-workspace.json`.
+ * Returns the workspace info if found, or `null` if not in a workspace.
+ */
+export function findWorkspace(startDir?: string): FluidWorkspace | null {
+  let dir = resolve(startDir ?? process.cwd());
+
+  // eslint-disable-next-line no-constant-condition
+  while (true) {
+    const candidate = join(dir, WORKSPACE_FILE);
+    if (existsSync(candidate)) {
+      try {
+        const raw = readFileSync(candidate, "utf-8");
+        const config = JSON.parse(raw) as WorkspaceConfig;
+        return { root: dir, config };
+      } catch {
+        return null;
+      }
+    }
+    const parent = dirname(dir);
+    if (parent === dir) break; // reached filesystem root
+    dir = parent;
+  }
+
+  return null;
+}
+
+/**
+ * If cwd is already inside `{workspace}/local/{company}/...`, return that
+ * theme root directory. Otherwise return null.
+ *
+ * Examples (workspace root = /code/fluid-theme-dev):
+ *   cwd = /code/fluid-theme-dev/local/acme-co           → /code/fluid-theme-dev/local/acme-co
+ *   cwd = /code/fluid-theme-dev/local/acme-co/templates  → /code/fluid-theme-dev/local/acme-co
+ *   cwd = /code/fluid-theme-dev                          → null
+ *   cwd = /code/fluid-theme-dev/local                    → null
+ */
+export function resolveThemeRootFromCwd(
+  workspace: FluidWorkspace,
+): string | null {
+  const cwd = resolve(process.cwd());
+  const localDir = join(workspace.root, "local");
+  const rel = relative(localDir, cwd);
+
+  // Not under local/ at all, or exactly at local/
+  if (rel.startsWith("..") || rel === ".") return null;
+
+  // rel is like "acme-co" or "acme-co/templates/subfolder"
+  // The theme root is the first segment: local/{company}
+  const firstSegment = rel.split(sep)[0];
+  if (!firstSegment) return null;
+
+  return join(localDir, firstSegment);
+}

package/tsdown.config.ts

@@ -5,7 +5,7 @@ export default defineConfig({
   format: ["esm"],
   dts: { eager: true },
   clean: true,
-  target: "node18",
+  target: "node24",
   deps: {
     neverBundle: [
       "@fluid-app/fluid-cli",