@fluid-app/fluid-cli-theme-dev 0.1.18 → 0.1.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-app/fluid-cli-theme-dev",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "description": "Fluid CLI plugin for theme developer workflows — dev server, push, pull, init",
   "type": "module",
   "main": "./dist/index.mjs",
@@ -36,8 +36,8 @@
     "typescript": "^5",
     "@fluid-app/api-client-core": "0.1.0",
     "@fluid-app/theme-schema": "0.1.0",
-    "@fluid-app/typescript-config": "0.0.0",
-    "@fluid-app/themes-api-client": "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/lint.ts

@@ -3,6 +3,7 @@ import { Command } from "commander";
 import {
   findMissingSectionReferences,
   validateSchemaText,
+  VALID_SETTING_TYPES,
   type BlocksSchemaType,
   type Diagnostic,
   type TemplateInput,
@@ -15,19 +16,14 @@ interface FileDiagnostics {
   diagnostics: Diagnostic[];
 }
 
-// A theme section is defined by a liquid file under `templates/sections/`.
-// Returns the section name a `{% section %}` tag would reference, or null if
-// the file is not a section definition. Handles both the flat layout
-// (`templates/sections/hero.liquid`) and the nested one
-// (`templates/sections/hero/index.liquid`).
+// 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] === "templates" &&
-    parts[1] === "sections" &&
-    parts.length >= 3
-  ) {
-    return parts[2]!.replace(/\.liquid$/, "");
+  if (parts[0] === "sections" && parts.length >= 2) {
+    return parts[1]!.replace(/\.liquid$/, "");
   }
   return null;
 }
@@ -118,6 +114,18 @@ export function createLintCommand(): Command {
         }
       }
 
+      // 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({
@@ -125,6 +133,9 @@ export function createLintCommand(): Command {
             errors,
             warnings,
             filesChecked: liquidFiles.length,
+            ...(hasInvalidSettingType
+              ? { validSettingTypes: VALID_SETTING_TYPES }
+              : {}),
             files: results,
           }),
         );
@@ -153,8 +164,8 @@ function printText(
         d.severity === "error"
           ? chalk.red("error".padEnd(7))
           : chalk.yellow("warning".padEnd(7));
-      // Only the first line — diagnostics like the invalid-setting-type list
-      // carry a long multi-line body that the `--json` output preserves.
+      // 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}`);
     }

package/src/theme/file.ts

@@ -14,6 +14,18 @@ import {
   type BlocksSchemaType,
 } from "@fluid-app/theme-schema";
 
+// Top-level theme folders that are not page templates. Everything else at the
+// top level (home_page, product, page, footer, navbar, …) is a page template.
+const NON_TEMPLATE_DIRS = new Set([
+  "sections",
+  "blocks",
+  "components",
+  "layouts",
+  "config",
+  "assets",
+  "locales",
+]);
+
 export class ThemeFile {
   readonly absolutePath: string;
   readonly relativePath: string;
@@ -72,16 +84,12 @@ export class ThemeFile {
   }
 
   get isTemplate(): boolean {
-    // Template files (home_page, product, etc.) expect blocks as objects.
-    // Section files expect blocks as arrays.
+    // Page templates (home_page, product, footer, navbar, …) live in top-level
+    // page-type folders and expect blocks as objects. The reserved categories
+    // below either expect blocks as arrays (sections, blocks, components) or
+    // carry no block schema (layouts, config, assets, locales).
     const parts = this.relativePath.split(/[/\\]/);
-    return (
-      parts[0] === "templates" &&
-      parts.length >= 3 &&
-      parts[1] !== "sections" &&
-      parts[1] !== "blocks" &&
-      parts[1] !== "components"
-    );
+    return parts.length >= 2 && !NON_TEMPLATE_DIRS.has(parts[0]!);
   }
 
   validateSchema(): Diagnostic[] {