@betterstart/cli 0.1.47 → 0.1.49

package/dist/cli.js

@@ -2643,13 +2643,29 @@ function escapeQuotes(str) {
   return str.replace(/'/g, "\\'");
 }
 function buildComponentSource(p7) {
+  const queryClientImport = p7.hasFileUpload ? `
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'` : "";
+  const queryClientSetup = p7.hasFileUpload ? `
+const queryClient = new QueryClient()
+` : "";
+  const formComponentDecl = p7.hasFileUpload ? `function ${p7.pascal}FormInner` : `export function ${p7.pascal}Form`;
+  const exportWrapper = p7.hasFileUpload ? `
+export function ${p7.pascal}Form() {
+  return (
+    <QueryClientProvider client={queryClient}>
+      <${p7.pascal}FormInner />
+    </QueryClientProvider>
+  )
+}
+` : "";
   return `'use client'
 
 import { zodResolver } from '@hookform/resolvers/zod'
 import { Check, ChevronLeft, ChevronRight } from 'lucide-react'
+import { parseAsInteger, parseAsArrayOf, useQueryState } from 'nuqs'
 import { useState } from 'react'
 ${p7.rhfImport}
-import { z } from 'zod/v3'
+import { z } from 'zod/v3'${queryClientImport}
 import { create${p7.pascal}Submission } from '@cms/actions/${p7.kebab}-form'
 import { Button } from '${p7.buttonImport}'
 import {
@@ -2679,12 +2695,13 @@ ${p7.zodFields}
 })
 
 type FormValues = z.infer<typeof formSchema>
-
+${queryClientSetup}
 ${p7.stepsConst}
 
-export function ${p7.pascal}Form() {
-  const [currentStep, setCurrentStep] = useState(0)
-  const [completedSteps, setCompletedSteps] = useState<Set<number>>(new Set())
+${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)
 
@@ -2701,13 +2718,15 @@ ${p7.fieldArraySetup}${p7.watchSetup}
       STEPS[currentStep].fields as (keyof FormValues)[]
     )
     if (isValid) {
-      setCompletedSteps((prev) => new Set(prev).add(currentStep))
-      setCurrentStep((prev) => prev + 1)
+      if (!completedSteps.has(currentStep)) {
+        setCompletedStepsArr([...completedStepsArr, currentStep])
+      }
+      setCurrentStep(currentStep + 1)
     }
   }
 
   function handleBack() {
-    setCurrentStep((prev) => prev - 1)
+    setCurrentStep(currentStep - 1)
   }
 
   function handleStepClick(index: number) {
@@ -2829,7 +2848,7 @@ ${p7.stepContentBlocks}
     </Form>
   )
 }
-`;
+${exportWrapper}`;
 }
 
 // src/generators/form-pipeline/form-component-single.ts
@@ -2868,12 +2887,27 @@ ${buildFieldArrayDecls(listFields)}
   const selectImport = resolveUiImport(cwd, "select");
   const radioGroupImport = resolveUiImport(cwd, "radio-group");
   const mediaUploadImport = resolveUiImport(cwd, "media-upload-field");
+  const queryClientImport = hasFileUpload ? `
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'` : "";
+  const queryClientSetup = hasFileUpload ? `
+const queryClient = new QueryClient()
+` : "";
+  const formComponentDecl = hasFileUpload ? `function ${pascal}FormInner` : `export function ${pascal}Form`;
+  const exportWrapper = hasFileUpload ? `
+export function ${pascal}Form() {
+  return (
+    <QueryClientProvider client={queryClient}>
+      <${pascal}FormInner />
+    </QueryClientProvider>
+  )
+}
+` : "";
   const content = `'use client'
 
 import { zodResolver } from '@hookform/resolvers/zod'
 import { useState } from 'react'
 ${rhfImport}
-import { z } from 'zod/v3'
+import { z } from 'zod/v3'${queryClientImport}
 import { create${pascal}Submission } from '@cms/actions/${kebab}-form'
 import { Button } from '${buttonImport}'
 import {
@@ -2902,8 +2936,8 @@ ${zodFields}
 })
 
 type FormValues = z.infer<typeof formSchema>
-
-export function ${pascal}Form() {
+${queryClientSetup}
+${formComponentDecl}() {
   const [submitted, setSubmitted] = useState(false)
   const [submitting, setSubmitting] = useState(false)
 
@@ -2955,7 +2989,7 @@ ${fieldJSX}
     </Form>
   )
 }
-`;
+${exportWrapper}`;
   fs9.writeFileSync(filePath, content, "utf-8");
   return { files: [path9.relative(cwd, filePath)] };
 }