@betterstart/cli 0.1.52 → 0.1.54

package/dist/cli.js

@@ -2580,10 +2580,10 @@ function generateMultiStepForm(schema, cwd, cmsDir, options) {
   const zodFields = buildZodFields(allFields);
   const defaults = buildDefaultValues(allFields);
   const listFields = getListFields(allFields);
-  const hasListFields2 = listFields.length > 0;
+  const hasListFields = listFields.length > 0;
   const { setup: watchSetup } = buildWatchDecls(allFields);
-  const rhfImport = hasListFields2 ? `import { useFieldArray, useForm } from 'react-hook-form'` : `import { useForm } from 'react-hook-form'`;
-  const fieldArraySetup = hasListFields2 ? `
+  const rhfImport = hasListFields ? `import { useFieldArray, useForm } from 'react-hook-form'` : `import { useForm } from 'react-hook-form'`;
+  const fieldArraySetup = hasListFields ? `
 ${buildFieldArrayDecls(listFields)}
 ` : "";
   const stepsConst = buildStepsConstant(steps, schema);
@@ -2605,7 +2605,6 @@ ${fieldsJSX}
   const textareaImport = resolveUiImport(cwd, "textarea");
   const selectImport = resolveUiImport(cwd, "select");
   const radioGroupImport = resolveUiImport(cwd, "radio-group");
-  const progressImport = resolveUiImport(cwd, "progress");
   const mediaUploadImport = resolveUiImport(cwd, "media-upload-field");
   const content = buildComponentSource({
     pascal,
@@ -2613,13 +2612,13 @@ ${fieldsJSX}
     rhfImport,
     hasRadio,
     hasFileUpload,
+    hasListFields,
     buttonImport,
     formImport,
     inputImport,
     textareaImport,
     selectImport,
     radioGroupImport,
-    progressImport,
     mediaUploadImport,
     zodFields,
     defaults,
@@ -2666,8 +2665,8 @@ export function ${p7.pascal}Form() {
   return `'use client'
 
 import { zodResolver } from '@hookform/resolvers/zod'
-import { Check, ChevronLeft, ChevronRight${hasListFields ? ", Trash2" : ""} } from 'lucide-react'
-import { parseAsInteger, parseAsArrayOf, useQueryState } from 'nuqs'
+import { ChevronLeft, ChevronRight${p7.hasListFields ? ", Trash2" : ""} } from 'lucide-react'
+import { parseAsInteger, useQueryState } from 'nuqs'
 import { useState } from 'react'
 ${p7.rhfImport}
 import { z } from 'zod/v3'${queryClientImport}
@@ -2684,8 +2683,8 @@ import {
 } from '${p7.formImport}'
 import { Input } from '${p7.inputImport}'${p7.hasFileUpload ? `
 import { MediaUploadField } from '${p7.mediaUploadImport}'` : ""}
-import { Progress } from '${p7.progressImport}'${p7.hasRadio ? `
-import { RadioGroup, RadioGroupItem } from '${p7.radioGroupImport}'` : ""}
+${p7.hasRadio ? `import { RadioGroup, RadioGroupItem } from '${p7.radioGroupImport}'
+` : ""}
 import { Textarea } from '${p7.textareaImport}'
 import {
   Select,
@@ -2705,8 +2704,6 @@ ${p7.stepsConst}
 
 ${formComponentDecl}() {
   const [currentStep, setCurrentStep] = useQueryState('step', parseAsInteger.withDefault(0))
-  const [completedStepsArr, setCompletedStepsArr] = useQueryState('completed', parseAsArrayOf(parseAsInteger).withDefault([]))
-  const completedSteps = new Set(completedStepsArr)
   const [submitted, setSubmitted] = useState(false)
   const [submitting, setSubmitting] = useState(false)
 
@@ -2723,9 +2720,6 @@ ${p7.fieldArraySetup}${p7.watchSetup}
       STEPS[currentStep].fields as (keyof FormValues)[]
     )
     if (isValid) {
-      if (!completedSteps.has(currentStep)) {
-        setCompletedStepsArr([...completedStepsArr, currentStep])
-      }
       setCurrentStep(currentStep + 1)
     }
   }
@@ -2734,12 +2728,6 @@ ${p7.fieldArraySetup}${p7.watchSetup}
     setCurrentStep(currentStep - 1)
   }
 
-  function handleStepClick(index: number) {
-    if (index < currentStep || completedSteps.has(index)) {
-      setCurrentStep(index)
-    }
-  }
-
   async function onSubmit(values: FormValues) {
     setSubmitting(true)
     try {
@@ -2768,48 +2756,6 @@ ${p7.fieldArraySetup}${p7.watchSetup}
   return (
     <Form {...form}>
       <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-8">
-        {/* Mobile step indicator */}
-        <div className="md:hidden space-y-2">
-          <p className="text-sm text-muted-foreground">
-            Step {currentStep + 1} of {STEPS.length} &mdash; {STEPS[currentStep].label}
-          </p>
-          <Progress value={((currentStep + 1) / STEPS.length) * 100} />
-        </div>
-
-        {/* Desktop step indicator */}
-        <nav className="hidden md:flex items-center justify-center" aria-label="Form progress">
-          {STEPS.map((step, index) => (
-            <div key={step.name} className="flex items-center">
-              <button
-                type="button"
-                onClick={() => handleStepClick(index)}
-                disabled={index > currentStep && !completedSteps.has(index)}
-                aria-current={index === currentStep ? 'step' : undefined}
-                className={\`flex h-8 w-8 items-center justify-center rounded-full text-sm font-medium transition-colors \${
-                  completedSteps.has(index)
-                    ? 'bg-primary text-primary-foreground cursor-pointer'
-                    : index === currentStep
-                      ? 'border-2 border-primary text-primary'
-                      : 'border-2 border-muted text-muted-foreground'
-                }\`}
-              >
-                {completedSteps.has(index) ? (
-                  <Check className="h-4 w-4" />
-                ) : (
-                  index + 1
-                )}
-              </button>
-              {index < STEPS.length - 1 && (
-                <div
-                  className={\`h-0.5 w-8 mx-1 \${
-                    completedSteps.has(index) ? 'bg-primary' : 'bg-muted'
-                  }\`}
-                />
-              )}
-            </div>
-          ))}
-        </nav>
-
         {/* Step header */}
         <div>
           <h3 className="text-lg font-semibold">{STEPS[currentStep].label}</h3>
@@ -2873,14 +2819,14 @@ function generateSingleStepForm(schema, cwd, cmsDir, options) {
   const zodFields = buildZodFields(fields);
   const defaults = buildDefaultValues(fields);
   const listFields = getListFields(fields);
-  const hasListFields2 = listFields.length > 0;
+  const hasListFields = listFields.length > 0;
   const { setup: watchSetup } = buildWatchDecls(fields);
   const rawFields = schema.fields || [];
   const fieldJSX = renderFieldsJSX(rawFields);
   const submitText = schema.submitButtonText || "Submit";
   const successMessage = escapeJsx(schema.successMessage || "Form submitted successfully!");
-  const rhfImport = hasListFields2 ? `import { useFieldArray, useForm } from 'react-hook-form'` : `import { useForm } from 'react-hook-form'`;
-  const fieldArraySetup = hasListFields2 ? `
+  const rhfImport = hasListFields ? `import { useFieldArray, useForm } from 'react-hook-form'` : `import { useForm } from 'react-hook-form'`;
+  const fieldArraySetup = hasListFields ? `
 ${buildFieldArrayDecls(listFields)}
 ` : "";
   const hasRadio = fields.some((f) => f.type === "radio");
@@ -2907,7 +2853,7 @@ export function ${pascal}Form() {
   )
 }
 ` : "";
-  const lucideImport = hasListFields2 ? `
+  const lucideImport = hasListFields ? `
 import { Trash2 } from 'lucide-react'` : "";
   const content = `'use client'