create-mantiq 0.2.1 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-mantiq",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Scaffold a new MantiqJS application",
   "type": "module",
   "license": "MIT",

package/src/index.ts

@@ -78,7 +78,7 @@ if (!isCI && !kit) {
 
   // Framework selection
   const framework = await term.select('Which framework would you like to use?', [
-    { value: 'react', label: 'React', hint: 'Recommended' },
+    { value: 'react', label: 'React' },
     { value: 'vue', label: 'Vue' },
     { value: 'svelte', label: 'Svelte' },
     { value: 'none', label: 'None', hint: 'API only' },
@@ -133,6 +133,29 @@ const install = Bun.spawn(['bun', 'install'], {
 await install.exited
 spin.stop('Dependencies installed')
 
+// ── Install shadcn components (if selected) ─────────────────────────────────
+if (ui === 'shadcn' && kit === 'react') {
+  const shadcnSpin = term.spinner('Installing shadcn/ui components')
+
+  const run = async (args: string[]) => {
+    const p = Bun.spawn(['bunx', '--bun', ...args], {
+      cwd: projectDir,
+      stdout: 'pipe',
+      stderr: 'pipe',
+      env: { ...process.env, CI: 'true' },
+    })
+    await p.exited
+  }
+
+  // Init shadcn
+  await run(['shadcn@latest', 'init', '--defaults', '--force'])
+
+  // Install core components + sidebar
+  await run(['shadcn@latest', 'add', 'button', 'input', 'label', 'card', 'badge', 'table', 'avatar', 'separator', 'dropdown-menu', 'sheet', 'tooltip', 'sidebar', '--overwrite', '-y'])
+
+  shadcnSpin.stop('shadcn/ui components installed')
+}
+
 // ── Build frontend (if kit) ─────────────────────────────────────────────────
 if (kit) {
   const buildSpin = term.spinner('Building frontend assets')
@@ -168,15 +191,12 @@ if (!noGit) {
 }
 
 // ── Done ─────────────────────────────────────────────────────────────────────
-const summaryLines = [
-  `${emerald('✓')} ${bold(projectName)} created`,
-  '',
-  `${dim('Framework')}    ${kit ? bold(kit.charAt(0).toUpperCase() + kit.slice(1)) : dim('None (API only)')}`,
-  ...(kit === 'react' ? [`${dim('UI Kit')}       ${ui === 'shadcn' ? bold('shadcn/ui') : dim('Plain Tailwind')}`] : []),
-  '',
-  `${emerald('cd')} ${projectName}`,
-  `${emerald('bun mantiq')} migrate`,
-  `${emerald('bun run')} dev`,
-]
-
-term.box(summaryLines)
+console.log(`\n   ${emerald('✓')}  ${bold(projectName)} created\n`)
+console.log(`   ${dim('Framework')}    ${kit ? bold(kit.charAt(0).toUpperCase() + kit.slice(1)) : dim('None (API only)')}`)
+if (kit === 'react') console.log(`   ${dim('UI Kit')}       ${ui === 'shadcn' ? bold('shadcn/ui') : dim('Plain Tailwind')}`)
+console.log(`\n   ${dim('Next steps:')}\n`)
+console.log(`   cd ${projectName}`)
+console.log(`   bun mantiq migrate`)
+console.log(`   bun run dev\n`)
+
+process.exit(0)

package/src/ui/shadcn.ts

@@ -6,6 +6,30 @@ export function getShadcnTemplates(ctx: TemplateContext): {
 } {
   return {
     files: {
+      // ── tsconfig override with @/ path alias ──────────────────────────────
+      'tsconfig.json': JSON.stringify({
+        compilerOptions: {
+          target: 'ESNext',
+          module: 'ESNext',
+          moduleResolution: 'bundler',
+          lib: ['ESNext', 'DOM', 'DOM.Iterable'],
+          types: ['bun-types'],
+          jsx: 'react-jsx',
+          strict: true,
+          noImplicitAny: true,
+          strictNullChecks: true,
+          noUncheckedIndexedAccess: true,
+          noImplicitOverride: true,
+          allowImportingTsExtensions: true,
+          noEmit: true,
+          skipLibCheck: true,
+          baseUrl: '.',
+          paths: { '@/*': ['./src/*'] },
+        },
+        include: ['./**/*'],
+        exclude: ['node_modules'],
+      }, null, 2) + '\n',
+
       // ── cn helper ───────────────────────────────────────────────────────────
       'src/lib/utils.ts': `import { type ClassValue, clsx } from 'clsx'
 import { twMerge } from 'tailwind-merge'
@@ -28,8 +52,11 @@ export function cn(...inputs: ClassValue[]) {
           cssVariables: true,
         },
         aliases: {
-          components: 'src/components',
-          utils: 'src/lib/utils',
+          components: '@/components',
+          utils: '@/lib/utils',
+          ui: '@/components/ui',
+          lib: '@/lib',
+          hooks: '@/hooks',
         },
       }, null, 2) + '\n',
 
@@ -37,6 +64,17 @@ export function cn(...inputs: ClassValue[]) {
       'src/style.css': `@import "tailwindcss";
 @custom-variant dark (&:where(.dark, .dark *));
 
+/*
+ * shadcn/ui theme — default: emerald
+ *
+ * To swap themes, visit https://ui.shadcn.com/themes
+ * Pick a theme, copy the CSS variables, and replace
+ * the :root and .dark blocks below.
+ *
+ * Or install a community theme:
+ *   bunx --bun shadcn@latest add @ss-themes/caffeine
+ */
+
 @theme inline {
   --color-background: var(--background);
   --color-foreground: var(--foreground);
@@ -163,444 +201,17 @@ export function cn(...inputs: ClassValue[]) {
 .animate-fade-up { animation: fadeUp 0.4s ease-out; }
 `,
 
-      // ── Button component ────────────────────────────────────────────────────
-      'src/components/ui/button.tsx': `import * as React from 'react'
-import { Slot } from '@radix-ui/react-slot'
-import { cva, type VariantProps } from 'class-variance-authority'
-import { cn } from '../../lib/utils.ts'
-
-const buttonVariants = cva(
-  'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
-  {
-    variants: {
-      variant: {
-        default:
-          'bg-primary text-primary-foreground shadow hover:bg-primary/90',
-        destructive:
-          'bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90',
-        outline:
-          'border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground',
-        secondary:
-          'bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80',
-        ghost: 'hover:bg-accent hover:text-accent-foreground',
-        link: 'text-primary underline-offset-4 hover:underline',
-      },
-      size: {
-        default: 'h-9 px-4 py-2',
-        sm: 'h-8 rounded-md px-3 text-xs',
-        lg: 'h-10 rounded-md px-8',
-        icon: 'h-9 w-9',
-      },
-    },
-    defaultVariants: {
-      variant: 'default',
-      size: 'default',
-    },
-  }
-)
-
-export interface ButtonProps
-  extends React.ButtonHTMLAttributes<HTMLButtonElement>,
-    VariantProps<typeof buttonVariants> {
-  asChild?: boolean
-}
-
-const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
-  ({ className, variant, size, asChild = false, ...props }, ref) => {
-    const Comp = asChild ? Slot : 'button'
-    return (
-      <Comp
-        className={cn(buttonVariants({ variant, size, className }))}
-        ref={ref}
-        {...props}
-      />
-    )
-  }
-)
-Button.displayName = 'Button'
-
-export { Button, buttonVariants }
-`,
-
-      // ── Input component ─────────────────────────────────────────────────────
-      'src/components/ui/input.tsx': `import * as React from 'react'
-import { cn } from '../../lib/utils.ts'
-
-export interface InputProps
-  extends React.InputHTMLAttributes<HTMLInputElement> {}
-
-const Input = React.forwardRef<HTMLInputElement, InputProps>(
-  ({ className, type, ...props }, ref) => {
-    return (
-      <input
-        type={type}
-        className={cn(
-          'flex h-9 w-full rounded-md border border-input bg-transparent px-3 py-1 text-sm shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50',
-          className
-        )}
-        ref={ref}
-        {...props}
-      />
-    )
-  }
-)
-Input.displayName = 'Input'
-
-export { Input }
-`,
-
-      // ── Label component ─────────────────────────────────────────────────────
-      'src/components/ui/label.tsx': `import * as React from 'react'
-import * as LabelPrimitive from '@radix-ui/react-label'
-import { cva, type VariantProps } from 'class-variance-authority'
-import { cn } from '../../lib/utils.ts'
-
-const labelVariants = cva(
-  'text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70'
-)
-
-const Label = React.forwardRef<
-  React.ElementRef<typeof LabelPrimitive.Root>,
-  React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root> &
-    VariantProps<typeof labelVariants>
->(({ className, ...props }, ref) => (
-  <LabelPrimitive.Root
-    ref={ref}
-    className={cn(labelVariants(), className)}
-    {...props}
-  />
-))
-Label.displayName = LabelPrimitive.Root.displayName
-
-export { Label }
-`,
-
-      // ── Card component ──────────────────────────────────────────────────────
-      'src/components/ui/card.tsx': `import * as React from 'react'
-import { cn } from '../../lib/utils.ts'
-
-const Card = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
-  <div
-    ref={ref}
-    className={cn(
-      'rounded-xl border border-border bg-card text-card-foreground shadow',
-      className
-    )}
-    {...props}
-  />
-))
-Card.displayName = 'Card'
-
-const CardHeader = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
-  <div
-    ref={ref}
-    className={cn('flex flex-col space-y-1.5 p-6', className)}
-    {...props}
-  />
-))
-CardHeader.displayName = 'CardHeader'
-
-const CardTitle = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
-  <div
-    ref={ref}
-    className={cn('font-semibold leading-none tracking-tight', className)}
-    {...props}
-  />
-))
-CardTitle.displayName = 'CardTitle'
-
-const CardDescription = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
-  <div
-    ref={ref}
-    className={cn('text-sm text-muted-foreground', className)}
-    {...props}
-  />
-))
-CardDescription.displayName = 'CardDescription'
-
-const CardContent = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
-  <div ref={ref} className={cn('p-6 pt-0', className)} {...props} />
-))
-CardContent.displayName = 'CardContent'
-
-const CardFooter = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
-  <div
-    ref={ref}
-    className={cn('flex items-center p-6 pt-0', className)}
-    {...props}
-  />
-))
-CardFooter.displayName = 'CardFooter'
-
-export { Card, CardHeader, CardFooter, CardTitle, CardDescription, CardContent }
-`,
-
-      // ── Badge component ─────────────────────────────────────────────────────
-      'src/components/ui/badge.tsx': `import * as React from 'react'
-import { cva, type VariantProps } from 'class-variance-authority'
-import { cn } from '../../lib/utils.ts'
-
-const badgeVariants = cva(
-  'inline-flex items-center rounded-md border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2',
-  {
-    variants: {
-      variant: {
-        default:
-          'border-transparent bg-primary text-primary-foreground shadow hover:bg-primary/80',
-        secondary:
-          'border-transparent bg-secondary text-secondary-foreground hover:bg-secondary/80',
-        destructive:
-          'border-transparent bg-destructive text-destructive-foreground shadow hover:bg-destructive/80',
-        outline: 'text-foreground',
-      },
-    },
-    defaultVariants: {
-      variant: 'default',
-    },
-  }
-)
-
-export interface BadgeProps
-  extends React.HTMLAttributes<HTMLDivElement>,
-    VariantProps<typeof badgeVariants> {}
-
-function Badge({ className, variant, ...props }: BadgeProps) {
-  return (
-    <div className={cn(badgeVariants({ variant }), className)} {...props} />
-  )
-}
-
-export { Badge, badgeVariants }
-`,
-
-      // ── Table component ─────────────────────────────────────────────────────
-      'src/components/ui/table.tsx': `import * as React from 'react'
-import { cn } from '../../lib/utils.ts'
-
-const Table = React.forwardRef<
-  HTMLTableElement,
-  React.HTMLAttributes<HTMLTableElement>
->(({ className, ...props }, ref) => (
-  <div className="relative w-full overflow-auto">
-    <table
-      ref={ref}
-      className={cn('w-full caption-bottom text-sm', className)}
-      {...props}
-    />
-  </div>
-))
-Table.displayName = 'Table'
-
-const TableHeader = React.forwardRef<
-  HTMLTableSectionElement,
-  React.HTMLAttributes<HTMLTableSectionElement>
->(({ className, ...props }, ref) => (
-  <thead ref={ref} className={cn('[&_tr]:border-b', className)} {...props} />
-))
-TableHeader.displayName = 'TableHeader'
-
-const TableBody = React.forwardRef<
-  HTMLTableSectionElement,
-  React.HTMLAttributes<HTMLTableSectionElement>
->(({ className, ...props }, ref) => (
-  <tbody
-    ref={ref}
-    className={cn('[&_tr:last-child]:border-0', className)}
-    {...props}
-  />
-))
-TableBody.displayName = 'TableBody'
-
-const TableFooter = React.forwardRef<
-  HTMLTableSectionElement,
-  React.HTMLAttributes<HTMLTableSectionElement>
->(({ className, ...props }, ref) => (
-  <tfoot
-    ref={ref}
-    className={cn(
-      'border-t bg-muted/50 font-medium [&>tr]:last:border-b-0',
-      className
-    )}
-    {...props}
-  />
-))
-TableFooter.displayName = 'TableFooter'
-
-const TableRow = React.forwardRef<
-  HTMLTableRowElement,
-  React.HTMLAttributes<HTMLTableRowElement>
->(({ className, ...props }, ref) => (
-  <tr
-    ref={ref}
-    className={cn(
-      'border-b transition-colors hover:bg-muted/50 data-[state=selected]:bg-muted',
-      className
-    )}
-    {...props}
-  />
-))
-TableRow.displayName = 'TableRow'
-
-const TableHead = React.forwardRef<
-  HTMLTableCellElement,
-  React.ThHTMLAttributes<HTMLTableCellElement>
->(({ className, ...props }, ref) => (
-  <th
-    ref={ref}
-    className={cn(
-      'h-10 px-2 text-left align-middle font-medium text-muted-foreground [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]',
-      className
-    )}
-    {...props}
-  />
-))
-TableHead.displayName = 'TableHead'
-
-const TableCell = React.forwardRef<
-  HTMLTableCellElement,
-  React.TdHTMLAttributes<HTMLTableCellElement>
->(({ className, ...props }, ref) => (
-  <td
-    ref={ref}
-    className={cn(
-      'p-2 align-middle [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]',
-      className
-    )}
-    {...props}
-  />
-))
-TableCell.displayName = 'TableCell'
-
-const TableCaption = React.forwardRef<
-  HTMLTableCaptionElement,
-  React.HTMLAttributes<HTMLTableCaptionElement>
->(({ className, ...props }, ref) => (
-  <caption
-    ref={ref}
-    className={cn('mt-4 text-sm text-muted-foreground', className)}
-    {...props}
-  />
-))
-TableCaption.displayName = 'TableCaption'
-
-export {
-  Table,
-  TableHeader,
-  TableBody,
-  TableFooter,
-  TableHead,
-  TableRow,
-  TableCell,
-  TableCaption,
-}
-`,
-
-      // ── Avatar component ────────────────────────────────────────────────────
-      'src/components/ui/avatar.tsx': `import * as React from 'react'
-import { cn } from '../../lib/utils.ts'
-
-const Avatar = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
-  <div
-    ref={ref}
-    className={cn(
-      'relative flex h-10 w-10 shrink-0 overflow-hidden rounded-full',
-      className
-    )}
-    {...props}
-  />
-))
-Avatar.displayName = 'Avatar'
-
-const AvatarImage = React.forwardRef<
-  HTMLImageElement,
-  React.ImgHTMLAttributes<HTMLImageElement>
->(({ className, ...props }, ref) => (
-  <img
-    ref={ref}
-    className={cn('aspect-square h-full w-full', className)}
-    {...props}
-  />
-))
-AvatarImage.displayName = 'AvatarImage'
-
-const AvatarFallback = React.forwardRef<
-  HTMLDivElement,
-  React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
-  <div
-    ref={ref}
-    className={cn(
-      'flex h-full w-full items-center justify-center rounded-full bg-muted',
-      className
-    )}
-    {...props}
-  />
-))
-AvatarFallback.displayName = 'AvatarFallback'
-
-export { Avatar, AvatarImage, AvatarFallback }
-`,
-
-      // ── Separator component ─────────────────────────────────────────────────
-      'src/components/ui/separator.tsx': `import * as React from 'react'
-import { cn } from '../../lib/utils.ts'
-
-interface SeparatorProps extends React.HTMLAttributes<HTMLDivElement> {
-  orientation?: 'horizontal' | 'vertical'
-  decorative?: boolean
-}
-
-const Separator = React.forwardRef<HTMLDivElement, SeparatorProps>(
-  (
-    { className, orientation = 'horizontal', decorative = true, ...props },
-    ref
-  ) => (
-    <div
-      ref={ref}
-      role={decorative ? 'none' : 'separator'}
-      aria-orientation={decorative ? undefined : orientation}
-      className={cn(
-        'shrink-0 bg-border',
-        orientation === 'horizontal' ? 'h-[1px] w-full' : 'h-full w-[1px]',
-        className
-      )}
-      {...props}
-    />
-  )
-)
-Separator.displayName = 'Separator'
-
-export { Separator }
-`,
+      // Components (button, input, label, card, badge, table, avatar,
+      // separator, sidebar, etc.) are installed by the shadcn CLI during
+      // scaffold — no hand-rolled templates needed.
 
       // ── Login page (shadcn) ─────────────────────────────────────────────────
       'src/pages/Login.tsx': `import { useState } from 'react'
 import { post } from '../lib/api.ts'
-import { Button } from '../components/ui/button.tsx'
-import { Input } from '../components/ui/input.tsx'
-import { Label } from '../components/ui/label.tsx'
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '../components/ui/card.tsx'
+import { Button } from '@/components/ui/button'
+import { Input } from '@/components/ui/input'
+import { Label } from '@/components/ui/label'
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'
 
 interface LoginProps {
   appName?: string
@@ -687,10 +298,10 @@ export default function Login({ appName = '${ctx.name}', navigate }: LoginProps)
       // ── Register page (shadcn) ──────────────────────────────────────────────
       'src/pages/Register.tsx': `import { useState } from 'react'
 import { post } from '../lib/api.ts'
-import { Button } from '../components/ui/button.tsx'
-import { Input } from '../components/ui/input.tsx'
-import { Label } from '../components/ui/label.tsx'
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '../components/ui/card.tsx'
+import { Button } from '@/components/ui/button'
+import { Input } from '@/components/ui/input'
+import { Label } from '@/components/ui/label'
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'
 
 interface RegisterProps {
   appName?: string
@@ -788,11 +399,11 @@ export default function Register({ appName = '${ctx.name}', navigate }: Register
       // ── Dashboard page (shadcn) ─────────────────────────────────────────────
       'src/pages/Dashboard.tsx': `import { useState, useEffect, useCallback } from 'react'
 import { api, post } from '../lib/api.ts'
-import { Button } from '../components/ui/button.tsx'
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '../components/ui/card.tsx'
-import { Badge } from '../components/ui/badge.tsx'
-import { Avatar, AvatarFallback } from '../components/ui/avatar.tsx'
-import { Separator } from '../components/ui/separator.tsx'
+import { Button } from '@/components/ui/button'
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'
+import { Badge } from '@/components/ui/badge'
+import { Avatar, AvatarFallback } from '@/components/ui/avatar'
+import { Separator } from '@/components/ui/separator'
 import {
   Table,
   TableBody,
@@ -800,7 +411,7 @@ import {
   TableHead,
   TableHeader,
   TableRow,
-} from '../components/ui/table.tsx'
+} from '@/components/ui/table'
 
 interface User { id: number; name: string; email: string; role: string }
 
@@ -1011,8 +622,6 @@ export default function Dashboard({ appName = '${ctx.name}', currentUser, users:
       'tailwind-merge': '^2.6.0',
       'class-variance-authority': '^0.7.0',
       'lucide-react': '^0.460.0',
-      '@radix-ui/react-slot': '^1.1.0',
-      '@radix-ui/react-label': '^2.1.0',
     },
   }
 }