@betterstart/cli 0.1.40 → 0.1.41

package/dist/cli.js

@@ -2226,6 +2226,15 @@ function toTypeScriptType(field, mode = "output") {
 }
 
 // src/generators/form-pipeline/form-component.ts
+function resolveUiImport(cwd, componentName) {
+  const locations = ["components/ui", "src/components/ui"];
+  for (const loc of locations) {
+    if (fs7.existsSync(path7.join(cwd, loc, `${componentName}.tsx`)) || fs7.existsSync(path7.join(cwd, loc, `${componentName}.ts`))) {
+      return `@/components/ui/${componentName}`;
+    }
+  }
+  return `@cms/components/ui/${componentName}`;
+}
 function escapeJsx(str) {
   return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
@@ -2256,13 +2265,45 @@ function generateFormComponent(schema, cwd, cmsDir, options) {
   const fieldArrayDecls = listFields.map(
     (f) => `  const ${f.name}FieldArray = useFieldArray({ control: form.control, name: '${f.name}' })`
   ).join("\n");
-  const fieldJSX = fields.filter((f) => f.name && !f.hidden).map((f) => generateFieldJSX(f)).join("\n\n");
+  const watchFields = /* @__PURE__ */ new Set();
+  for (const f of fields) {
+    if (f.showWhen) {
+      watchFields.add(f.showWhen.field);
+    }
+  }
+  const watchDecls = Array.from(watchFields).map((wf) => `  const ${wf}Value = form.watch('${wf}')`).join("\n");
+  const watchSetup = watchFields.size > 0 ? `
+${watchDecls}
+` : "";
+  const fieldJSX = fields.filter((f) => f.name && !f.hidden).map((f) => {
+    let jsx = generateFieldJSX(f);
+    if (f.showWhen) {
+      const watchVar = `${f.showWhen.field}Value`;
+      const { value } = f.showWhen;
+      if (Array.isArray(value)) {
+        const vals = value.map((v) => `'${v}'`).join(", ");
+        jsx = `        {[${vals}].includes(${watchVar} as string) && (
+${jsx}
+        )}`;
+      } else {
+        jsx = `        {${watchVar} === '${value}' && (
+${jsx}
+        )}`;
+      }
+    }
+    return jsx;
+  }).join("\n\n");
   const submitText = schema.submitButtonText || "Submit";
   const successMessage = escapeJsx(schema.successMessage || "Form submitted successfully!");
   const rhfImport = hasListFields ? `import { useFieldArray, useForm } from 'react-hook-form'` : `import { useForm } from 'react-hook-form'`;
   const fieldArraySetup = hasListFields ? `
 ${fieldArrayDecls}
 ` : "";
+  const buttonImport = resolveUiImport(cwd, "button");
+  const formImport = resolveUiImport(cwd, "form");
+  const inputImport = resolveUiImport(cwd, "input");
+  const textareaImport = resolveUiImport(cwd, "textarea");
+  const selectImport = resolveUiImport(cwd, "select");
   const content = `'use client'
 
 import { zodResolver } from '@hookform/resolvers/zod'
@@ -2270,7 +2311,7 @@ import { useState } from 'react'
 ${rhfImport}
 import { z } from 'zod/v3'
 import { create${pascal}Submission } from '@cms/actions/${kebab}-form'
-import { Button } from '@cms/components/ui/button'
+import { Button } from '${buttonImport}'
 import {
   Form,
   FormControl,
@@ -2279,16 +2320,16 @@ import {
   FormItem,
   FormLabel,
   FormMessage,
-} from '@cms/components/ui/form'
-import { Input } from '@cms/components/ui/input'
-import { Textarea } from '@cms/components/ui/textarea'
+} from '${formImport}'
+import { Input } from '${inputImport}'
+import { Textarea } from '${textareaImport}'
 import {
   Select,
   SelectContent,
   SelectItem,
   SelectTrigger,
   SelectValue,
-} from '@cms/components/ui/select'
+} from '${selectImport}'
 
 const formSchema = z.object({
 ${zodFields}
@@ -2306,7 +2347,7 @@ export function ${pascal}Form() {
 ${defaults}
     },
   })
-${fieldArraySetup}
+${fieldArraySetup}${watchSetup}
   async function onSubmit(values: FormValues) {
     setSubmitting(true)
     try {