migrate to valibot

.vscode/settings.json

@@ -15,6 +15,7 @@
     "tanstack",
     "Topbar",
     "trpc",
-    "undici"
+    "undici",
+    "valibot"
   ]
 }

package.json

@@ -27,10 +27,10 @@
     "eslint-plugin-solid": "^0.13.0",
     "eslint-plugin-sort-keys-fix": "^1.1.2",
     "eslint-plugin-tailwindcss": "^3.13.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
     "postcss": "^8.4.28",
     "prettier": "^3.0.2",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "solid-start-node": "0.2.26",
     "solid-start-vercel": "^0.3.4",
     "tailwindcss": "^3.3.3",
@@ -39,11 +39,11 @@
     "vite-plugin-solid": "^2.7.0"
   },
   "dependencies": {
-    "@notionhq/client": "2.2.11",
     "@auth/core": "^0.12.0",
     "@auth/solid-start": "^0.1.1",
     "@kobalte/core": "^0.10.0",
     "@kobalte/tailwindcss": "^0.7.0",
+    "@notionhq/client": "2.2.11",
     "@solid-primitives/i18n": "^1.4.1",
     "@solidjs/meta": "^0.28.6",
     "@solidjs/router": "^0.8.3",
@@ -54,7 +54,7 @@
     "solid-start": "0.3.4",
     "tailwind-merge": "1.14.0",
     "undici": "^5.23.0",
-    "zod": "^3.22.2"
+    "valibot": "^0.13.1"
   },
   "engines": {
     "node": ">=18"

src/modules/invoices/InvoiceForm/InvoiceForm.tsx

@@ -1,6 +1,6 @@
 import { useI18n } from "@solid-primitives/i18n";
 import { Show, createSignal, type Component, type JSX } from "solid-js";
-import type { ZodIssue } from "zod";
+import type * as v from "valibot";
 import { Button } from "~/components/Button";
 import { Card, CardBody } from "~/components/Card";
 import { DatePicker } from "~/components/DatePicker";
@@ -41,7 +41,7 @@ const formDefault: InvoiceFormData = {
 
 type FormItemContainerProps = {
   children: JSX.Element;
-  error?: ZodIssue;
+  error?: v.Issue;
   id: string;
   label: string;
 };
@@ -65,7 +65,7 @@ const FormItemContainer: Component<FormItemContainerProps> = (props) => {
 };
 
 type FormInputItemProps = TextFieldInputProps & {
-  error?: ZodIssue;
+  error?: v.Issue;
   id: string;
   isLoading: boolean;
   label: string;
@@ -104,7 +104,7 @@ const SubHeading: Component<SubHeadingProps> = (props) => {
 };
 
 type Props = {
-  error?: Record<string, ZodIssue>;
+  error?: Record<string, v.Issue>;
   id?: number;
   initial?: InvoiceFormData;
   isLoading: boolean;

src/server/env.ts

@@ -1,20 +1,20 @@
 import type { FetchEvent } from "solid-start";
-import { z } from "zod";
+import * as v from "valibot";
 
 if (typeof window !== "undefined") {
   throw new Error("SERVER ON CLIENT!");
 }
 
 const getEnvSchema = () => {
-  return z.object({
-    googleId: z.string(),
-    googleSecret: z.string(),
-    notionDatabase: z.string(),
-    notionKey: z.string(),
+  return v.object({
+    googleId: v.string(),
+    googleSecret: v.string(),
+    notionDatabase: v.string(),
+    notionKey: v.string(),
   });
 };
 
-type ServerEnv = z.infer<ReturnType<typeof getEnvSchema>>;
+type ServerEnv = v.Input<ReturnType<typeof getEnvSchema>>;
 
 type ServerEnvArgs = Pick<FetchEvent, "env" | "locals">;
 
@@ -28,7 +28,7 @@ export const serverEnv = ({ env, locals }: ServerEnvArgs): ServerEnv => {
 
   const envSchema = getEnvSchema();
 
-  const parsed = envSchema.parse({
+  const parsed = v.parse(envSchema, {
     googleId: env.GOOGLE_ID,
     googleSecret: env.GOOGLE_SECRET,
     notionDatabase: env.NOTION_DATABASE,

src/server/invoices/actions.ts

@@ -1,5 +1,5 @@
 import server$, { useRequest } from "solid-start/server";
-import { z } from "zod";
+import * as v from "valibot";
 import {
   createInvoice,
   deleteInvoice,
@@ -8,17 +8,21 @@ import {
   updateInvoice,
 } from "./api";
 
-const selectInvoiceArgs = z.object({
-  id: z.coerce.number(),
-});
+const selectInvoiceArgs = () => {
+  return v.object({
+    id: v.coerce(v.number(), Number),
+  });
+};
 
-export const selectInvoiceKey = (args: z.infer<typeof selectInvoiceArgs>) => {
+export const selectInvoiceKey = (
+  args: v.Input<ReturnType<typeof selectInvoiceArgs>>,
+) => {
   return ["selectInvoice", args] as const;
 };
 
 export const selectInvoiceServerQuery = server$(
   ([, args]: ReturnType<typeof selectInvoiceKey>) => {
-    const parsed = selectInvoiceArgs.parse(args);
+    const parsed = v.parse(selectInvoiceArgs(), args);
 
     const requestEvent = useRequest();
 
@@ -39,11 +43,15 @@ export const selectInvoiceServerQuery = server$(
   },
 );
 
-const selectInvoicesArgs = z.object({
-  startCursor: z.string().optional(),
-});
+const selectInvoicesArgs = () => {
+  return v.object({
+    startCursor: v.optional(v.string()),
+  });
+};
 
-export const selectInvoicesKey = (args: z.infer<typeof selectInvoicesArgs>) => {
+export const selectInvoicesKey = (
+  args: v.Input<ReturnType<typeof selectInvoicesArgs>>,
+) => {
   return ["selectInvoices", args] as const;
 };
 
@@ -53,7 +61,7 @@ export const selectAllInvoicesKey = () => {
 
 export const selectInvoicesServerQuery = server$(
   async ([, args]: ReturnType<typeof selectInvoicesKey>) => {
-    const parsed = selectInvoicesArgs.parse(args);
+    const parsed = v.parse(selectInvoicesArgs(), args);
 
     const requestEvent = useRequest();
 
@@ -86,37 +94,41 @@ export const selectInvoicesServerQuery = server$(
   },
 );
 
-const invoiceSchema = z.object({
-  buyerAddress1: z.string(),
-  buyerAddress2: z.string(),
-  buyerName: z.string(),
-  buyerNip: z.string(),
-  city: z.string(),
-  date: z.string(),
-  invoiceTitle: z.string(),
-  notes: z.string(),
-  paymentAccount: z.string(),
-  paymentBank: z.string(),
-  paymentMethod: z.string(),
-  sellerAddress1: z.string(),
-  sellerAddress2: z.string(),
-  sellerName: z.string(),
-  sellerNip: z.string(),
-  serviceCount: z.coerce.number().min(0),
-  servicePayed: z.coerce.number().min(0),
-  servicePrice: z.coerce.number().min(0),
-  serviceTitle: z.string(),
-  serviceUnit: z.string(),
-});
-
-const updateInvoiceArgs = z.intersection(
-  invoiceSchema,
-  z.object({ id: z.coerce.number() }),
-);
+const invoiceSchema = () => {
+  return v.object({
+    buyerAddress1: v.string(),
+    buyerAddress2: v.string(),
+    buyerName: v.string(),
+    buyerNip: v.string(),
+    city: v.string(),
+    date: v.string(),
+    invoiceTitle: v.string(),
+    notes: v.string(),
+    paymentAccount: v.string(),
+    paymentBank: v.string(),
+    paymentMethod: v.string(),
+    sellerAddress1: v.string(),
+    sellerAddress2: v.string(),
+    sellerName: v.string(),
+    sellerNip: v.string(),
+    serviceCount: v.coerce(v.number([v.minValue(0)]), Number),
+    servicePayed: v.coerce(v.number([v.minValue(0)]), Number),
+    servicePrice: v.coerce(v.number([v.minValue(0)]), Number),
+    serviceTitle: v.string(),
+    serviceUnit: v.string(),
+  });
+};
+
+const updateInvoiceArgs = () => {
+  return v.merge([
+    invoiceSchema(),
+    v.object({ id: v.coerce(v.number(), Number) }),
+  ]);
+};
 
 export const updateInvoiceServerMutation = server$(
-  async (data: z.infer<typeof updateInvoiceArgs>) => {
-    const parsed = updateInvoiceArgs.parse(data);
+  async (data: v.Input<ReturnType<typeof updateInvoiceArgs>>) => {
+    const parsed = v.parse(updateInvoiceArgs(), data);
 
     // const user = await getUser(server$);
 
@@ -131,8 +143,8 @@ export const updateInvoiceServerMutation = server$(
 );
 
 export const insertInvoiceServerMutation = server$(
-  async (data: z.infer<typeof invoiceSchema>) => {
-    const parsed = invoiceSchema.parse(data);
+  async (data: v.Input<ReturnType<typeof invoiceSchema>>) => {
+    const parsed = v.parse(invoiceSchema(), data);
 
     // const user = await getUser(server$);
 
@@ -142,11 +154,13 @@ export const insertInvoiceServerMutation = server$(
   },
 );
 
-const deleteSchemaArgs = z.object({ id: z.coerce.number() });
+const deleteSchemaArgs = () => {
+  return v.object({ id: v.coerce(v.number(), Number) });
+};
 
 export const deleteInvoiceServerMutation = server$(
-  async (data: z.infer<typeof deleteSchemaArgs>) => {
-    const parsed = deleteSchemaArgs.parse(data);
+  async (data: v.Input<ReturnType<typeof deleteSchemaArgs>>) => {
+    const parsed = v.parse(deleteSchemaArgs(), data);
 
     await deleteInvoice({ event: server$, id: parsed.id });