@fluid-app/fluid-cli-theme-dev 0.1.21 → 0.1.23

package/src/commands/lint.ts

@@ -1,186 +0,0 @@
-import chalk from "chalk";
-import { Command } from "commander";
-import {
-  findMissingSectionReferences,
-  validateSchemaText,
-  VALID_SETTING_TYPES,
-  type BlocksSchemaType,
-  type Diagnostic,
-  type TemplateInput,
-} from "@fluid-app/theme-schema";
-import { ThemeRoot } from "../theme/root.js";
-import { findWorkspace, resolveThemeRootFromCwd } from "../workspace.js";
-
-interface FileDiagnostics {
-  path: string;
-  diagnostics: Diagnostic[];
-}
-
-// A theme section is defined by a liquid file under the top-level `sections/`
-// directory. Returns the section name a `{% section %}` tag would reference, or
-// null if the file is not a section definition. Handles both the flat layout
-// (`sections/hero.liquid`) and the nested one (`sections/hero/index.liquid`).
-function sectionNameOf(relativePath: string): string | null {
-  const parts = relativePath.split(/[/\\]/);
-  if (parts[0] === "sections" && parts.length >= 2) {
-    return parts[1]!.replace(/\.liquid$/, "");
-  }
-  return null;
-}
-
-export function createLintCommand(): Command {
-  return new Command("lint")
-    .description("Validate theme files locally (read-only — no upload)")
-    .option("--root <path>", "Theme root directory", ".")
-    .option("--json", "Output results as compact JSON")
-    .action(async (opts: { root: string; json?: boolean }) => {
-      // Resolve the theme root the same way push/dev do: when left at the
-      // default, prefer the workspace's theme root if we're inside one.
-      let rootPath = opts.root;
-      if (rootPath === ".") {
-        const workspace = findWorkspace();
-        if (workspace) {
-          rootPath = resolveThemeRootFromCwd(workspace) ?? rootPath;
-        }
-      }
-
-      const themeRoot = new ThemeRoot(rootPath);
-      if (!themeRoot.isValid()) {
-        const message = `'${rootPath}' does not look like a theme directory.`;
-        if (opts.json) {
-          console.log(JSON.stringify({ ok: false, error: message }));
-        } else {
-          console.error(message);
-        }
-        process.exit(1);
-      }
-
-      const files = themeRoot.files();
-      // Read each liquid file once and reuse the content for both passes
-      // (validateSchemaText and the section scan) to avoid a double disk read.
-      const liquidFiles = files
-        .filter((f) => f.isLiquid)
-        .map((f) => ({ file: f, content: f.read() }));
-
-      const byFile = new Map<string, Diagnostic[]>();
-      const record = (path: string, diagnostic: Diagnostic): void => {
-        const existing = byFile.get(path);
-        if (existing) existing.push(diagnostic);
-        else byFile.set(path, [diagnostic]);
-      };
-
-      // ── Schema pass — the same {% schema %} validation `fluid theme push`
-      // runs. blocksSchemaType mirrors ThemeFile.validateSchema: page/layout
-      // templates use object blocks, sections use array blocks.
-      for (const { file, content } of liquidFiles) {
-        const blocksSchemaType: BlocksSchemaType = file.isTemplate
-          ? "object"
-          : "array";
-        for (const diagnostic of validateSchemaText(content, {
-          blocksSchemaType,
-        })) {
-          record(file.relativePath, diagnostic);
-        }
-      }
-
-      // ── Section pass — flag `{% section 'x' %}` references to a section
-      // that has no definition on disk. Section definitions and assets are
-      // not themselves referrers, so they are excluded from the scan.
-      const existingSectionNames = new Set<string>();
-      for (const { file } of liquidFiles) {
-        const name = sectionNameOf(file.relativePath);
-        if (name) existingSectionNames.add(name);
-      }
-      const referrers: TemplateInput[] = liquidFiles
-        .filter(({ file }) => sectionNameOf(file.relativePath) === null)
-        .map(({ file, content }) => ({ path: file.relativePath, content }));
-      for (const missing of findMissingSectionReferences(
-        referrers,
-        existingSectionNames,
-      )) {
-        record(missing.templatePath, missing.diagnostic);
-      }
-
-      const results: FileDiagnostics[] = [...byFile.entries()]
-        .map(([path, diagnostics]) => ({ path, diagnostics }))
-        .sort((a, b) => a.path.localeCompare(b.path));
-
-      let errors = 0;
-      let warnings = 0;
-      for (const { diagnostics } of results) {
-        for (const d of diagnostics) {
-          if (d.severity === "error") errors++;
-          else warnings++;
-        }
-      }
-
-      // Surface the canonical setting types once (not in every diagnostic) so a
-      // consumer fixing an "Invalid settings type" error has the valid set to
-      // hand without it bloating each message.
-      const hasInvalidSettingType = results.some(({ diagnostics }) =>
-        diagnostics.some(
-          (d) =>
-            d.target?.kind === "setting" &&
-            d.target.field === "type" &&
-            d.target.settingType !== undefined,
-        ),
-      );
-
-      if (opts.json) {
-        console.log(
-          JSON.stringify({
-            ok: errors === 0,
-            errors,
-            warnings,
-            filesChecked: liquidFiles.length,
-            ...(hasInvalidSettingType
-              ? { validSettingTypes: VALID_SETTING_TYPES }
-              : {}),
-            files: results,
-          }),
-        );
-      } else {
-        printText(results, errors, warnings, liquidFiles.length);
-      }
-
-      process.exit(errors > 0 ? 1 : 0);
-    });
-}
-
-function plural(count: number, noun: string): string {
-  return `${count} ${noun}${count === 1 ? "" : "s"}`;
-}
-
-function printText(
-  results: FileDiagnostics[],
-  errors: number,
-  warnings: number,
-  filesChecked: number,
-): void {
-  for (const { path, diagnostics } of results) {
-    console.log(chalk.bold(path));
-    for (const d of diagnostics) {
-      const label =
-        d.severity === "error"
-          ? chalk.red("error".padEnd(7))
-          : chalk.yellow("warning".padEnd(7));
-      // Only the first line — a few messages (e.g. the `Invalid JSON:` parse
-      // error) carry a multi-line body that `--json` preserves in full.
-      const message = d.message.split("\n")[0];
-      console.log(`  ${label} ${message}`);
-    }
-  }
-
-  const suffix = `(${plural(filesChecked, "file")} checked)`;
-  if (errors > 0) {
-    console.log(
-      `\n${chalk.red(`✖ ${plural(errors, "error")}, ${plural(warnings, "warning")}`)} ${suffix}`,
-    );
-  } else if (warnings > 0) {
-    console.log(
-      `\n${chalk.yellow(`⚠ ${plural(warnings, "warning")}`)} ${suffix}`,
-    );
-  } else {
-    console.log(`${chalk.green("✓ No problems found")} ${suffix}`);
-  }
-}

package/src/commands/navigate.ts

@@ -1,259 +0,0 @@
-import { Command } from "commander";
-import prompts from "prompts";
-import { requireToken, createApiClient } from "../api.js";
-import { getLastDevThemeId } from "../plugin-state.js";
-import { themes } from "@fluid-app/themes-api-client";
-
-function localSuggest(
-  input: string,
-  choices: prompts.Choice[],
-): prompts.Choice[] {
-  if (!input) return choices;
-  const lower = input.toLowerCase();
-  return choices.filter((c) => c.title.toLowerCase().includes(lower));
-}
-
-interface ThemeTemplate {
-  id: number;
-  name: string;
-  themeable_type: string;
-  default: boolean;
-}
-
-interface TemplatesResponse {
-  templates: ThemeTemplate[];
-}
-
-const THEMEABLE_TYPE_MAP: Record<string, string> = {
-  "/home": "home_page",
-  "/home/shop": "shop_page",
-  "/home/join": "join_page",
-  "/cart": "cart_page",
-  "/home/blog": "post_page",
-  "/home/categories": "category_page",
-  "/home/collections": "collection_page",
-};
-
-const STATIC_ROUTES = [
-  { label: "Home", path: "/home" },
-  { label: "Shop", path: "/home/shop" },
-  { label: "Join / Sign Up", path: "/home/join" },
-  { label: "Cart", path: "/cart" },
-  { label: "Blog", path: "/home/blog" },
-  { label: "Categories (all)", path: "/home/categories" },
-  { label: "Collections (all)", path: "/home/collections" },
-] as const;
-
-const RESOURCE_ROUTES = [
-  {
-    label: "Category",
-    type: "category",
-    template: "/home/categories/%s",
-    fallback: "/home/categories",
-  },
-  {
-    label: "Collection",
-    type: "collection",
-    template: "/home/collections/%s",
-    fallback: "/home/collections",
-  },
-  {
-    label: "Product",
-    type: "product",
-    template: "/home/products/%s",
-    fallback: "/home/shop",
-  },
-  {
-    label: "Library",
-    type: "library",
-    template: "/home/libraries/%s",
-    fallback: "/home/libraries",
-  },
-  {
-    label: "Post",
-    type: "post",
-    template: "/home/posts/%s",
-    fallback: "/home/blog",
-  },
-  {
-    label: "Media",
-    type: "medium",
-    template: "/home/media/%s",
-    fallback: "/home/media",
-  },
-  {
-    label: "Enrollment Pack",
-    type: "enrollment_pack",
-    template: "/home/enrollments/%s",
-    fallback: "/home/join",
-  },
-  {
-    label: "Page",
-    type: "page",
-    template: "/home/pages/%s",
-    fallback: "/home/pages",
-  },
-] as const;
-
-async function fetchTemplatesForType(
-  api: ReturnType<typeof createApiClient>,
-  themeId: number,
-  themeableType: string,
-): Promise<ThemeTemplate[]> {
-  const params = new URLSearchParams({
-    application_theme_id: String(themeId),
-    themeable_type: themeableType,
-    published: "true",
-  });
-  const body = await api.get<TemplatesResponse>(
-    `/api/application_theme_templates?${params}`,
-  );
-  return body.templates ?? [];
-}
-
-async function selectTemplate(
-  api: ReturnType<typeof createApiClient>,
-  themeId: number,
-  themeableType: string,
-  onCancel: () => void,
-): Promise<number | null> {
-  const templates = await fetchTemplatesForType(api, themeId, themeableType);
-  if (templates.length <= 1) return null;
-
-  const templateChoices = templates.map((t) => ({
-    title: `${t.name}${t.default ? " (default)" : ""}`,
-    value: t.id,
-  }));
-  const { templateId } = await prompts(
-    {
-      type: "autocomplete",
-      name: "templateId",
-      message: "Select a template",
-      choices: templateChoices,
-      suggest: (input: string, choices: prompts.Choice[]) =>
-        Promise.resolve(localSuggest(input, choices)),
-    },
-    { onCancel },
-  );
-
-  return templateId ?? null;
-}
-
-export function createNavigateCommand(): Command {
-  return new Command("navigate")
-    .description("Interactively navigate to a route in the dev server browser")
-    .option("--host <host>", "Dev server host", "127.0.0.1")
-    .option("--port <port>", "Dev server port", "9292")
-    .option("-t, --theme <id>", "Theme ID (defaults to active dev theme)")
-    .action(async (opts: { host: string; port: string; theme?: string }) => {
-      requireToken();
-
-      const themeId = opts.theme ? Number(opts.theme) : getLastDevThemeId();
-
-      if (!themeId) {
-        console.error(
-          "No active dev theme. Run `fluid theme dev` first, or pass --theme <id>.",
-        );
-        process.exit(1);
-      }
-
-      const address = `http://${opts.host}:${opts.port}`;
-
-      type Choice = {
-        title: string;
-        value:
-          | string
-          | {
-              resourceType: string;
-              template: string;
-              fallback: string;
-              label: string;
-            };
-      };
-      const choices: Choice[] = [
-        ...STATIC_ROUTES.map((r) => ({ title: r.label, value: r.path })),
-        ...RESOURCE_ROUTES.map((r) => ({
-          title: `${r.label} (select specific)`,
-          value: {
-            resourceType: r.type,
-            template: r.template,
-            fallback: r.fallback,
-            label: r.label,
-          },
-        })),
-      ];
-
-      const onCancel = () => process.exit(130);
-
-      const { dest } = await prompts(
-        {
-          type: "autocomplete",
-          name: "dest",
-          message: "Select a route",
-          choices,
-          suggest: (input: string, choices: prompts.Choice[]) =>
-            Promise.resolve(localSuggest(input, choices)),
-        },
-        { onCancel },
-      );
-
-      if (!dest) return;
-
-      const api = createApiClient();
-      let path: string;
-      let themeableType: string | undefined;
-
-      if (typeof dest === "string") {
-        path = dest;
-        themeableType = THEMEABLE_TYPE_MAP[dest];
-      } else {
-        themeableType = dest.resourceType;
-        const body = await themes.getApplicationThemeAvailableThemeables(
-          api,
-          themeId,
-          { themeable: dest.resourceType, per_page: 50 },
-        );
-        const resources = body.available_themeables ?? [];
-
-        if (!resources.length) {
-          console.log(`No ${dest.label} resources found, using listing page.`);
-          path = dest.fallback;
-        } else {
-          const resourceChoices = resources.map((r) => ({
-            title: r.title ?? r.slug ?? "Untitled",
-            value: r.slug,
-          }));
-          const { slug } = await prompts(
-            {
-              type: "autocomplete",
-              name: "slug",
-              message: `Select a ${dest.label.toLowerCase()}`,
-              choices: resourceChoices,
-              suggest: (input: string, choices: prompts.Choice[]) =>
-                Promise.resolve(localSuggest(input, choices)),
-            },
-            { onCancel },
-          );
-          path = dest.template.replace("%s", slug as string);
-        }
-      }
-
-      let templateParam = "";
-      if (themeableType) {
-        const templateId = await selectTemplate(
-          api,
-          themeId,
-          themeableType,
-          onCancel,
-        );
-        if (templateId) {
-          templateParam = `?theme_template_id=${templateId}`;
-        }
-      }
-
-      const url = `${address}${path}${templateParam}`;
-      console.log(`\nNavigating to: ${url}\n`);
-      const open = (await import("open")).default;
-      await open(url);
-    });
-}

package/src/commands/pull.ts

@@ -1,242 +0,0 @@
-import { join, resolve } from "node:path";
-import chalk from "chalk";
-import { Command } from "commander";
-import ora from "ora";
-import prompts from "prompts";
-import { requireToken, createApiClient } from "../api.js";
-import { readThemeConfig, writeThemeConfig } from "../theme-config.js";
-import { ThemeRoot } from "../theme/root.js";
-import { Syncer } from "../theme/syncer.js";
-import { selectTheme, findTheme } from "../theme-picker.js";
-import { findWorkspace, resolveThemeRootFromCwd } from "../workspace.js";
-
-interface CompanyMe {
-  data: { company: { subdomain?: string; name?: string } };
-}
-
-async function fetchCompanySubdomain(
-  api: ReturnType<typeof createApiClient>,
-): Promise<string> {
-  const res = await api.get<CompanyMe>("/api/company/v1/companies/me");
-  const subdomain = res.data?.company?.subdomain;
-  if (!subdomain) {
-    console.error(
-      "Could not determine company subdomain. Make sure your token is valid.",
-    );
-    process.exit(1);
-  }
-  return subdomain;
-}
-
-function formatRelativeTime(iso: string): string {
-  const diff = Date.now() - new Date(iso).getTime();
-  const minutes = Math.floor(diff / 60_000);
-  if (minutes < 1) return "just now";
-  if (minutes < 60) return `${minutes}m ago`;
-  const hours = Math.floor(minutes / 60);
-  if (hours < 24) return `${hours}h ago`;
-  const days = Math.floor(hours / 24);
-  if (days === 1) return "yesterday";
-  const date = new Date(iso);
-  return `${days}d ago (${date.toLocaleDateString("en-US", { month: "short", day: "numeric", year: "numeric" })})`;
-}
-
-/**
- * Detect files where both local and remote have changed since the last pull.
- * Returns the set of conflicting resource keys.
- */
-function detectConflicts(
-  storedChecksums: Record<string, string>,
-  remoteChecksums: Record<string, string>,
-  themeRoot: ThemeRoot,
-): string[] {
-  const conflicts: string[] = [];
-  for (const [key, storedChecksum] of Object.entries(storedChecksums)) {
-    const remoteChecksum = remoteChecksums[key];
-    if (remoteChecksum === undefined) continue; // deleted on remote, not a conflict
-    if (remoteChecksum === storedChecksum) continue; // remote unchanged
-
-    // Remote changed — check if local also changed
-    const file = themeRoot.file(key);
-    if (!file.exists) continue; // local deleted, not a conflict (remote wins)
-    const localChecksum = file.checksum();
-    if (localChecksum === storedChecksum) continue; // local unchanged, safe to overwrite
-    if (localChecksum === remoteChecksum) continue; // both sides made same change
-
-    conflicts.push(key);
-  }
-  return conflicts;
-}
-
-export function createPullCommand(): Command {
-  return new Command("pull")
-    .description("Pull a remote theme to your local directory")
-    .option("-t, --theme <name-or-id>", "Theme name or ID to pull")
-    .option("-n, --nodelete", "Do not delete local files missing on remote")
-    .option("--root <path>", "Theme root directory")
-    .option("-y, --yes", "Skip confirmation prompt")
-    .action(
-      async (opts: {
-        theme?: string;
-        nodelete?: boolean;
-        root?: string;
-        yes?: boolean;
-      }) => {
-        requireToken();
-
-        const api = createApiClient();
-        const workspace = findWorkspace();
-
-        const theme = opts.theme
-          ? await findTheme(api, opts.theme)
-          : await selectTheme(api, "Select a theme to pull");
-
-        // Resolve output directory
-        const subdomain = await fetchCompanySubdomain(api);
-        let root: string;
-        if (opts.root) {
-          root = opts.root;
-        } else if (workspace) {
-          // If already inside local/{company}/, use that directory
-          root =
-            resolveThemeRootFromCwd(workspace) ??
-            join(workspace.root, "local", subdomain);
-        } else {
-          root = `.`;
-        }
-
-        const absoluteRoot = resolve(root);
-        const existingConfig = readThemeConfig(absoluteRoot);
-
-        // Pre-flight summary
-        console.log();
-        console.log(`  Theme:   ${chalk.bold(theme.name)} (#${theme.id})`);
-        console.log(`  Company: ${chalk.bold(subdomain)}`);
-        console.log(`  Target:  ${chalk.bold(absoluteRoot)}`);
-        if (existingConfig?.lastPulledAt) {
-          console.log(
-            `  Last pulled: ${formatRelativeTime(existingConfig.lastPulledAt)}`,
-          );
-        }
-        console.log();
-
-        // Conflict detection — only possible if we have a previous pull's checksums
-        const themeRoot = new ThemeRoot(root);
-        let skipKeys: Set<string> | undefined;
-
-        if (existingConfig?.checksums) {
-          const fetchSpinner = ora("Checking for conflicts…").start();
-          const syncer = new Syncer(api, theme.id, themeRoot);
-          await syncer.fetchChecksums();
-          const remoteChecksums = syncer.remoteChecksums();
-          const conflicts = detectConflicts(
-            existingConfig.checksums,
-            remoteChecksums,
-            themeRoot,
-          );
-          fetchSpinner.stop();
-
-          if (conflicts.length > 0) {
-            console.log(
-              chalk.yellow(`⚠ ${conflicts.length} conflict(s) detected:\n`),
-            );
-            for (const key of conflicts) {
-              console.log(`  ${key}`);
-            }
-            console.log();
-
-            const { resolution } = await prompts(
-              {
-                type: "select",
-                name: "resolution",
-                message: "How do you want to handle conflicts?",
-                choices: [
-                  {
-                    title: "Keep local (skip conflicting files)",
-                    value: "keep-local",
-                  },
-                  {
-                    title: "Use remote (overwrite local changes)",
-                    value: "use-remote",
-                  },
-                  { title: "Abort", value: "abort" },
-                ],
-              },
-              { onCancel: () => process.exit(130) },
-            );
-
-            if (resolution === "abort") {
-              console.log("Aborted.");
-              process.exit(0);
-            }
-
-            if (resolution === "keep-local") {
-              skipKeys = new Set(conflicts);
-            }
-            // "use-remote" → skipKeys stays undefined, everything gets overwritten
-          }
-        }
-
-        if (!opts.yes && !skipKeys) {
-          const { confirmed } = await prompts(
-            {
-              type: "confirm",
-              name: "confirmed",
-              message: "Pull theme to this directory?",
-              initial: true,
-            },
-            { onCancel: () => process.exit(130) },
-          );
-          if (!confirmed) {
-            console.log("Aborted.");
-            process.exit(0);
-          }
-        }
-
-        const syncer = new Syncer(api, theme.id, themeRoot);
-        const spinner = ora(`Pulling ${theme.name} (#${theme.id})…`).start();
-
-        const result = await syncer.downloadTheme({
-          delete: !opts.nodelete,
-          skip: skipKeys,
-          onProgress: (d, total) => {
-            spinner.text = `Downloading ${d}/${total} files…`;
-          },
-        });
-
-        // Write .fluid-theme.json with the post-pull state.
-        // For skipped files, preserve the old stored checksum so the conflict
-        // is still detected on the next pull (instead of silently overwriting).
-        const newChecksums = syncer.remoteChecksums();
-        if (skipKeys && existingConfig?.checksums) {
-          for (const key of skipKeys) {
-            const oldChecksum = existingConfig.checksums[key];
-            if (oldChecksum) {
-              newChecksums[key] = oldChecksum;
-            }
-          }
-        }
-
-        writeThemeConfig(absoluteRoot, {
-          themeId: theme.id,
-          themeName: theme.name,
-          company: subdomain,
-          lastPulledAt: new Date().toISOString(),
-          checksums: newChecksums,
-        });
-
-        const parts: string[] = [`Downloaded ${result.downloaded} file(s)`];
-        if (result.deleted > 0)
-          parts.push(`deleted ${result.deleted} local file(s)`);
-        if (result.skipped > 0)
-          parts.push(`skipped ${result.skipped} conflict(s)`);
-
-        if (result.errors.length) {
-          spinner.warn(`Pulled with ${result.errors.length} error(s).`);
-          for (const e of result.errors) console.error(`  ${e}`);
-        } else {
-          spinner.succeed(`${parts.join(", ")}.`);
-        }
-      },
-    );
-}