@betterstart/cli 0.1.71 → 0.1.73

package/dist/cli.js

@@ -84,7 +84,7 @@ function walkFields(fields, callback, options = DEFAULT_WALK_OPTIONS) {
   function walk(fieldsToWalk, depth, parent) {
     for (const field of fieldsToWalk) {
       callback(field, depth, parent);
-      if (options.includeGroups && field.type === "group" && field.fields) {
+      if (options.includeGroups && (field.type === "group" || field.type === "section") && field.fields) {
         walk(field.fields, depth + 1, field);
       }
       if (options.includeLists && field.type === "list" && field.fields) {
@@ -140,7 +140,7 @@ function flattenFields(fields) {
 function flattenFieldsWithoutIdCheck(fields) {
   const flattened = [];
   for (const field of fields) {
-    if (field.type === "group" && field.fields) {
+    if ((field.type === "group" || field.type === "section") && field.fields) {
       flattened.push(...flattenFieldsWithoutIdCheck(field.fields));
     } else if (field.type === "tabs" && field.tabs) {
       for (const tab of field.tabs) {
@@ -3353,12 +3353,12 @@ var FIELD_TYPES = {
   TABS: "tabs",
   LIST: "list",
   SEPARATOR: "separator",
-  BREAK: "break",
+  SECTION: "section",
   SELECT: "select",
   RELATIONSHIP: "relationship",
   CURRICULUM: "curriculum"
 };
-var LAYOUT_FIELD_TYPES = [FIELD_TYPES.SEPARATOR, FIELD_TYPES.BREAK];
+var LAYOUT_FIELD_TYPES = [FIELD_TYPES.SEPARATOR];
 var NESTED_FIELD_TYPES = [FIELD_TYPES.GROUP, FIELD_TYPES.TABS, FIELD_TYPES.LIST];
 var RICH_TEXT_FIELD_TYPES = [FIELD_TYPES.MARKDOWN, FIELD_TYPES.TEXT];
 var LONG_TEXT_FIELD_TYPES = [
@@ -6139,7 +6139,7 @@ function generateFieldJSXCore(field, indent = "          ") {
   const fieldType = getFormFieldType(field);
   const label = field.label || field.name;
   const hintJSX = field.hint ? `${indent}      <FormDescription>${field.hint}</FormDescription>` : "";
-  if (field.type === "group" && field.fields) return renderGroupField(field, indent, label);
+  if ((field.type === "group" || field.type === "section") && field.fields) return renderGroupField(field, indent, label);
   if (field.type === "separator") return renderSeparatorField(field, indent);
   if (field.type === "boolean") return renderBooleanField(field, indent, label, hintJSX);
   if (field.type === "image") return renderImageField(field, indent, label, hintJSX);
@@ -6969,42 +6969,50 @@ ${hasDraft ? `            <Button
 // src/generators/form/form-single.ts
 import fs21 from "fs";
 import path21 from "path";
-function parseCardGroups(allFormFields) {
+function parseCardGroups(allFormFields, schemaLabel) {
+  const sections = allFormFields.filter((f) => f.type === "section" && f.fields);
+  const nonSections = allFormFields.filter((f) => f.type !== "section" && !isLayoutField(f.type));
+  if (sections.length === 0) {
+    const title = nonSections[0]?.label || nonSections[0]?.name || schemaLabel;
+    return [
+      {
+        title,
+        description: "",
+        hint: "",
+        varPrefix: toCamelCase(nonSections[0]?.name || "form"),
+        componentName: `${toPascalCase(nonSections[0]?.name || "form")}Card`,
+        fields: nonSections,
+        flatFields: flattenFields(nonSections).filter((f) => !isLayoutField(f.type))
+      }
+    ];
+  }
   const groups = [];
-  let currentFields = [];
-  let nextTitle = "";
-  let nextDescription = "";
-  for (const field of allFormFields) {
-    if (field.type === "break") {
-      if (currentFields.length > 0) {
-        groups.push(buildGroup(currentFields, nextTitle, nextDescription));
-      }
-      nextTitle = field.label || "";
-      nextDescription = field.hint || "";
-      currentFields = [];
-      continue;
-    }
-    if (field.type === "separator") continue;
-    currentFields.push(field);
+  for (const section of sections) {
+    const innerFields = section.fields || [];
+    groups.push({
+      title: section.label || section.name,
+      description: section.description || "",
+      hint: section.hint || "",
+      varPrefix: toCamelCase(section.name),
+      componentName: `${toPascalCase(section.name)}Card`,
+      fields: innerFields,
+      flatFields: flattenFields(innerFields).filter((f) => !isLayoutField(f.type))
+    });
   }
-  if (currentFields.length > 0) {
-    groups.push(buildGroup(currentFields, nextTitle, nextDescription));
+  if (nonSections.length > 0) {
+    const title = nonSections[0]?.label || nonSections[0]?.name || "General";
+    groups.unshift({
+      title,
+      description: "",
+      hint: "",
+      varPrefix: toCamelCase(nonSections[0]?.name || "general"),
+      componentName: `${toPascalCase(nonSections[0]?.name || "General")}Card`,
+      fields: nonSections,
+      flatFields: flattenFields(nonSections).filter((f) => !isLayoutField(f.type))
+    });
   }
   return groups;
 }
-function buildGroup(fields, titleOverride, description) {
-  const firstField = fields[0];
-  const title = titleOverride || firstField.label || firstField.name;
-  const varPrefix = toCamelCase(firstField.name);
-  return {
-    title,
-    description,
-    varPrefix,
-    componentName: `${toPascalCase(firstField.name)}Card`,
-    fields,
-    flatFields: flattenFields(fields).filter((f) => !isLayoutField(f.type))
-  };
-}
 function analyzeGroup(fields) {
   const tabFieldNames = /* @__PURE__ */ new Set();
   for (const f of fields) {
@@ -7033,7 +7041,7 @@ function analyzeGroup(fields) {
   const hasTabsField = fields.some((f) => f.type === "tabs");
   const tabsField = fields.find((f) => f.type === "tabs");
   const firstTabName = tabsField?.tabs?.[0]?.name || "";
-  return { relFields, listFieldsWithNested, hasTabsField, tabsField, firstTabName, tabFieldNames };
+  return { relFields, listFieldsWithNested, hasTabsField, firstTabName, tabFieldNames };
 }
 function buildGroupFieldsJSX(group3, analysis, skipLabel) {
   const indent = "            ";
@@ -7083,7 +7091,6 @@ function generateCardComponent(group3, schema, analysis) {
   const fieldsJSX = buildGroupFieldsJSX(group3, analysis, isSingleField);
   const relState = buildGroupRelState(analysis);
   const fieldArrayHooks = buildGroupFieldArrayHooks(analysis);
-  const needsReact = analysis.relFields.length > 0 || analysis.listFieldsWithNested.length > 0;
   const descriptionLine = group3.description ? `
             <CardDescription>${group3.description}</CardDescription>` : "";
   return `const ${group3.varPrefix}Schema = z.object({
@@ -7125,15 +7132,16 @@ ${fieldArrayHooks}
         )
         mutation.mutate(cleaned as Upsert${Singular}Input)
       })}>
-        <Card>
+        <Card className="material-sm!">
           <CardHeader>
             <CardTitle>${group3.title}</CardTitle>${descriptionLine}
           </CardHeader>
           <CardContent className="space-y-6">
 ${fieldsJSX}
           </CardContent>
-          <CardFooter>
-            <Button type="submit" disabled={isPending} size="sm">
+          <CardFooter>${group3.hint ? `
+            <p className="text-sm text-muted-foreground">${group3.hint}</p>` : ""}
+            <Button type="submit" disabled={isPending} size="sm" className="ml-auto">
               {isPending ? 'Saving...' : 'Save'}
             </Button>
           </CardFooter>
@@ -7154,7 +7162,7 @@ function generateSingleForm(schema, cwd, pagesDir, options = {}) {
   const allFormFields = schema.fields.filter(
     (f) => !f.primaryKey && f.name !== "createdAt" && f.name !== "updatedAt"
   );
-  const cardGroups = parseCardGroups(allFormFields);
+  const cardGroups = parseCardGroups(allFormFields, schema.label);
   const hasBoolean = hasFieldType(schema.fields, "boolean");
   const hasImage = hasFieldType(schema.fields, "image");
   const hasVideo = hasFieldType(schema.fields, "video");
@@ -10080,9 +10088,25 @@ function defaultSettingsSchema() {
       description: "General Settings",
       icon: "Settings",
       fields: [
-        { name: "siteName", type: "string", label: "Site Name", default: "BetterStart" },
-        { name: "break1", type: "break" },
-        { name: "logo", type: "image", label: "Logo" }
+        {
+          type: "section",
+          name: "siteSettings",
+          label: "Site Settings",
+          description: "General settings for the site",
+          fields: [
+            { name: "appName", type: "string", label: "App Name", hint: "Displayed in the sidebar and throughout the dashboard", default: "BetterStart" },
+            { name: "appDescription", type: "text", label: "App Description", hint: "A brief description of the application" }
+          ]
+        },
+        {
+          type: "section",
+          name: "branding",
+          label: "Branding",
+          description: "Logo and visual identity",
+          fields: [
+            { name: "logo", type: "image", label: "Logo" }
+          ]
+        }
       ]
     },
     null,