Minor code updates

src/commands/add/auth/lucia/generators.ts

@@ -519,8 +519,8 @@ export async function updateUser(
 
   if (!result.success) {
     const error = result.error.flatten().fieldErrors;
-    if (error.name) return { error: "Invalid name - " + error.name[0] };
-    if (error.email) return { error: "Invalid email - " + error.email[0] };
+    if (error.name) return { error: \`Invalid name - \${error.name[0]}\` };
+    if (error.email) return { error: \`Invalid email - \${error.email[0]}\` };
     return genericError;
   }
 
@@ -694,10 +694,10 @@ const generateAuthDirFiles = (
   const utilsTs = `import { redirect } from 'next/navigation'
 import { cookies } from 'next/headers'
 
-import { type Cookie } from 'lucia'
+import type { Cookie } from 'lucia'
 
 import { validateRequest } from './lucia'
-import { UsernameAndPassword, authenticationSchema } from '../db/schema/auth'
+import { type UsernameAndPassword, authenticationSchema } from '../db/schema/auth'
 
 export type AuthSession = {
   session: {
@@ -735,9 +735,9 @@ export const setAuthCookie = (cookie: Cookie) => {
   cookies().set(cookie);
 }
 
-const getErrorMessage = (errors: any): string => {
+const getErrorMessage = (errors: { email?: string[] | undefined; password?: string[] | undefined }): string => {
   if (errors.email) return 'Invalid Email'
-  if (errors.password) return 'Invalid Password - ' + errors.password[0]
+  if (errors.password) return \`Invalid Password - \${errors.password[0]}\`
   return '' // return a default error message or an empty string
 }
 
@@ -814,7 +814,7 @@ export const validateRequest = cache(
     const result = await lucia.validateSession(sessionId)
     // next.js throws when you attempt to set cookie when rendering page
     try {
-      if (result.session && result.session.fresh) {
+      if (result.session?.fresh) {
         const sessionCookie = lucia.createSessionCookie(result.session.id)
         cookies().set(
           sessionCookie.name,

src/commands/add/auth/lucia/index.ts

@@ -133,7 +133,7 @@ export const addLucia = async () => {
         removeExtension: false,
         prefix: "rootPath",
       }),
-      `import { z } from "zod";
+      `import type { z } from "zod";
 
 export const authenticationSchema = z.object({
   email: z.string().email().min(5).max(31),

src/commands/add/auth/lucia/utils.ts

@@ -78,7 +78,7 @@ import { sessions, users } from "../db/schema/auth";
 };
 
 export const DrizzleLuciaSchema: { [k in DBType]: string } = {
-  pg: `import { z } from "zod";  
+  pg: `import type { z } from "zod";  
 import { pgTable, timestamp, text } from "drizzle-orm/pg-core";
 
 export const users = pgTable("user", {
@@ -99,7 +99,7 @@ export const sessions = pgTable("session", {
 	}).notNull()
 });
 `,
-  mysql: `import { z } from "zod";
+  mysql: `import type { z } from "zod";
 import { mysqlTable, varchar, datetime } from "drizzle-orm/mysql-core";
 
 export const users = mysqlTable("user", {
@@ -128,7 +128,7 @@ export const sessions = mysqlTable("session", {
 		.references(() => users.id),
 	expiresAt: datetime("expires_at").notNull()
 });`,
-  sqlite: `import { z } from "zod";
+  sqlite: `import type { z } from "zod";
 import { sqliteTable, text, integer } from "drizzle-orm/sqlite-core";
 
 export const users = sqliteTable("user", {

src/commands/add/auth/shared/generators.ts

@@ -11,7 +11,7 @@ export const createUserSettingsComponent = () => {
   return `"use client";
 import UpdateNameCard from "./UpdateNameCard";
 import UpdateEmailCard from "./UpdateEmailCard";
-import { AuthSession } from "${formatFilePath(shared.auth.authUtils, {
+import type { AuthSession } from "${formatFilePath(shared.auth.authUtils, {
     prefix: "alias",
     removeExtension: true,
   })}";
@@ -58,7 +58,7 @@ export default function UpdateNameCard({ name }: { name: string }) {
   });
 
   useEffect(() => {
-    if (state.success == true) toast.success("Updated User");
+    if (state.success === true) toast.success("Updated User");
     if (state.error) toast.error("Error", { description: state.error });
   }, [state]);
 
@@ -161,7 +161,7 @@ export default function UpdateNameCard({ name }: { name: string }) {
   });
 
   useEffect(() => {
-    if (state.success == true) alert("Updated User");
+    if (state.success === true) alert("Updated User");
     if (state.error) alert("Error");
   }, [state]);
 
@@ -288,7 +288,7 @@ export default function UpdateEmailCard({ email }: { email: string }) {
   });
 
   useEffect(() => {
-    if (state.success == true) toast.success("Updated Email");
+    if (state.success === true) toast.success("Updated Email");
     if (state.error) toast.error("Error", { description: state.error });
   }, [state]);
 
@@ -393,7 +393,7 @@ export default function UpdateEmailCard({ email }: { email: string }) {
   });
 
   useEffect(() => {
-    if (state.success == true) alert("Updated User");
+    if (state.success === true) alert("Updated User");
     if (state.error) alert("Error");
   }, [state]);
 

src/commands/add/componentLib/shadcn-ui/generators.ts

@@ -197,7 +197,7 @@ const generateThemeProvider = () => {
 
 import * as React from "react";
 import { ThemeProvider as NextThemesProvider } from "next-themes";
-import { type ThemeProviderProps } from "next-themes/dist/types";
+import type { ThemeProviderProps } from "next-themes/dist/types";
 
 export function ThemeProvider({ children, ...props }: ThemeProviderProps) {
   return <NextThemesProvider {...props}>{children}</NextThemesProvider>;

src/commands/add/misc/defaultStyles/generators.ts

@@ -200,6 +200,7 @@ const landingPage = `/**
  * Documentation: https://v0.dev/docs#integrating-generated-code-into-your-nextjs-app
  */
 import Link from "next/link";
+import type { JSX,SVGProps } from "react"
 
 export default function LandingPage() {
   return (
@@ -359,7 +360,7 @@ export default function LandingPage() {
   );
 }
 
-function MountainIcon(props: any) {
+function MountainIcon(props: JSX.IntrinsicAttributes & SVGProps<SVGSVGElement>) {
   return (
     <svg
       {...props}

src/commands/add/misc/navbar/generators.ts

@@ -172,7 +172,7 @@ export default function Page() {
 
 const generateNavConfig = () => {
   const { componentLib, auth } = readConfigFile();
-  return `import { SidebarLink } from "${formatFilePath(
+  return `import type { SidebarLink } from "${formatFilePath(
     "components/SidebarItems",
     {
       prefix: "alias",
@@ -210,7 +210,7 @@ const generateSidebarItemsTsx = () => {
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 
-import { LucideIcon } from "lucide-react";
+import type { LucideIcon } from "lucide-react";
 
 ${
   componentLib === "shadcn-ui"
@@ -260,7 +260,7 @@ const SidebarLinkGroup = ({
   border?: boolean;
 }) => {
   const fullPathname = usePathname();
-  const pathname = "/" + fullPathname.split("/")[1];
+  const pathname = \`/\${fullPathname.split("/")[1]}\`;
 
   return (
     <div className={border ? "border-border border-t my-8 pt-4" : ""}>
@@ -347,7 +347,7 @@ import SidebarItems from "./SidebarItems";${
           : null
     }
 
-import { AuthSession, getUserAuth } from "${formatFilePath(
+import { type AuthSession, getUserAuth } from "${formatFilePath(
       shared.auth.authUtils,
       {
         prefix: "alias",
@@ -378,7 +378,7 @@ const UserDetails = ({ session }: { session: AuthSession }) => {
   if (session.session === null) return null;
   const { user } = session.session;
 
-  if (!user?.name || user.name.length == 0) return null;
+  if (!user?.name || user.name.length === 0) return null;
 
   return (
     <Link href="/account">

src/commands/add/misc/resend/generators.ts

@@ -15,7 +15,7 @@ import { emailSchema } from "${formatFilePath(resend.emailUtils, {
     removeExtension: true,
   })}";
 import { useRef, useState } from "react";
-import { z } from "zod";
+import type { z } from "zod";
 
 type FormInput = z.infer<typeof emailSchema>;
 type Errors = { [K in keyof FormInput]: string[] };
@@ -220,7 +220,7 @@ export const resend = new Resend(env.RESEND_API_KEY);
 };
 
 const generateEmailUtilsTs = () => {
-  return `import { z } from "zod";
+  return `import type { z } from "zod";
 
 export const emailSchema = z.object({
   name: z.string().min(3),

src/commands/add/misc/trpc/generators.ts

@@ -52,7 +52,7 @@ export const protectedProcedure = t.procedure.use(enforceUserIsAuthed);
 `;
   const { trpc } = getFilePaths();
   return `import { initTRPC, TRPCError } from "@trpc/server";
-import { Context } from "${formatFilePath(trpc.trpcContext, {
+import type { Context } from "${formatFilePath(trpc.trpcContext, {
     prefix: "alias",
     removeExtension: true,
   })}";
@@ -121,7 +121,7 @@ export const apiTrpcRouteTs = () => {
   const { trpc, shared } = getFilePaths();
   return `import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
 
-import { NextRequest } from "next/server";
+import type { NextRequest } from "next/server";
 import { appRouter } from "${formatFilePath(trpc.rootRouter, {
     prefix: "alias",
     removeExtension: true,
@@ -166,7 +166,7 @@ export const libTrpcClientTs = () => {
   const { trpc } = getFilePaths();
   return `import { createTRPCReact } from "@trpc/react-query";
 
-import { type AppRouter } from "${formatFilePath(trpc.rootRouter, {
+import type { AppRouter } from "${formatFilePath(trpc.rootRouter, {
     prefix: "alias",
     removeExtension: true,
   })}";
@@ -180,7 +180,8 @@ export const libTrpcProviderTsx = () => {
 
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { loggerLink, unstable_httpBatchStreamLink } from "@trpc/client";
-import React, { useState } from "react";
+import type React from "react";
+import { useState } from "react";
 
 import { trpc } from "./client";
 import { getUrl } from "./utils";
@@ -273,7 +274,7 @@ import {
   TRPCClientError,
 } from "@trpc/client";
 import { callProcedure } from "@trpc/server";
-import { type TRPCErrorResponse } from "@trpc/server/rpc";
+import type { TRPCErrorResponse } from "@trpc/server/rpc";
 import { observable } from "@trpc/server/observable";
 
 import { cache } from "react";
@@ -386,15 +387,15 @@ export const libTrpcUtilsTs = () => {
 }
 
 export function getUrl() {
-  return getBaseUrl() + "/api/trpc";
+  return \`\${getBaseUrl()}/api/trpc\`;
 }`;
 };
 
 export const libTrpcApiTsBatchLink = () => {
   const { trpc } = getFilePaths();
 
   return `import { cookies } from "next/headers";
-import { type AppRouter } from "${formatFilePath(trpc.rootRouter, {
+import type { AppRouter } from "${formatFilePath(trpc.rootRouter, {
     prefix: "alias",
     removeExtension: true,
   })}";

src/commands/add/orm/drizzle/generators.ts

@@ -859,7 +859,7 @@ const generateEnvMjs = (
   blank = false
 ) => {
   return `import { createEnv } from "@t3-oss/env-nextjs";
-import { z } from "zod";${
+import type { z } from "zod";${
     preferredPackageManager !== "bun" && ormType === "drizzle"
       ? '\nimport "dotenv/config";'
       : ""

src/commands/add/orm/prisma/generators.ts

@@ -60,7 +60,7 @@ if (process.env.NODE_ENV !== "production") global.db = db;
 export const generatePrismaComputerModel = () => {
   const { alias } = readConfigFile();
   return `import { computerSchema } from "${alias}/zodAutoGenSchemas";
-import { z } from "zod";
+import type { z } from "zod";
 
 export const insertComputerSchema = computerSchema;
 export const insertComputerParams = computerSchema.omit({

src/commands/generate/generators/apiRoute.ts

@@ -24,7 +24,7 @@ const generateRouteContent = (schema: Schema, driver: DBType) => {
 
   const template = `import { NextResponse } from "next/server";
 import { revalidatePath } from "next/cache";
-import { z } from "zod";
+import type { z } from "zod";
 
 import {
   create${tableNameSingularCapitalised},

src/commands/generate/generators/model/schema/index.ts

@@ -86,7 +86,7 @@ const generateImportStatement = (
       .join(", ")
       .concat(
         `, ${mappings.tableFunc}`
-      )}${schema.index ? ", uniqueIndex" : ""} } from "drizzle-orm/${dbType}-core";\nimport { createInsertSchema, createSelectSchema } from "drizzle-zod";\nimport { z } from "zod";\n${
+      )}${schema.index ? ", uniqueIndex" : ""} } from "drizzle-orm/${dbType}-core";\nimport { createInsertSchema, createSelectSchema } from "drizzle-zod";\nimport type { z } from "zod";\n${
       referenceImports.length > 0 ? referenceImports.join("\n") : ""
     }${
       belongsToUser && provider !== "planetscale" && authSubType !== "managed"
@@ -96,7 +96,7 @@ const generateImportStatement = (
           })}";`
         : ""
     }
-import { type get${tableNameCapitalised} } from "${formatFilePath(
+import type { get${tableNameCapitalised} } from "${formatFilePath(
       shared.orm.servicesDir,
       { prefix: "alias", removeExtension: false }
     )}/${tableNameCamelCase}/queries";
@@ -111,7 +111,7 @@ import { nanoid${
   }
   if (orm === "prisma")
     return `import { ${tableNameSingular}Schema } from "${alias}/zodAutoGenSchemas";
-import { z } from "zod";${
+import type { z } from "zod";${
       schema.includeTimestamps
         ? `\nimport { timestamps } from "${formatFilePath("lib/utils", {
             prefix: "alias",

src/commands/generate/generators/views-with-server-actions.ts

@@ -801,7 +801,7 @@ const createFormComponent = (schema: Schema) => {
     ...new Set(schema.fields.map((field) => field.type)),
   ] as ColumnType[];
 
-  return `import { z } from "zod";
+  return `import type { z } from "zod";
 
 import { useState, useTransition } from "react";
 import { useFormStatus } from "react-dom";
@@ -933,6 +933,20 @@ const ${tableNameSingularCapitalised}Form = ({${
     }
   };
 
+  const onError = (
+    action: Action,
+    data?: { error: string; values: ${tableNameSingularCapitalised} },
+  ) => {
+    const failed = Boolean(data?.error);
+    if (failed) {
+      openModal && openModal(data?.values);
+      toast.error(\`Failed to \${action}\`, {
+        description: data?.error ?? "Error",
+      });
+    }
+    return
+  };
+
   const handleSubmit = async (data: FormData) => {
     setErrors(null);