[PET-39] Upgrade to zod v4 (Upgrade Zod to v4 and update imports and enum references)

convex/_generated/dataModel.d.ts

@@ -1,4 +1,4 @@
- 
+/* eslint-disable */
 /**
  * Generated data model types.
  *

convex/_generated/server.d.ts

@@ -1,4 +1,4 @@
- 
+/* eslint-disable */
 /**
  * Generated utilities for implementing server-side Convex query and mutation functions.
  *

convex/_generated/server.js

@@ -1,4 +1,4 @@
- 
+/* eslint-disable */
 /**
  * Generated utilities for implementing server-side Convex query and mutation functions.
  *

convex/dictionary/models.ts

@@ -1,5 +1,5 @@
 import { defineTable } from 'convex/server';
-import { zodToConvex } from 'convex-helpers/server/zod';
+import { zodToConvex } from 'convex-helpers/server/zod4';
 import { z } from 'zod';
 
 import { getBaseDbModel } from '../shared/models';

convex/leaderboardEntries/model.ts

@@ -1,5 +1,5 @@
 import { defineTable } from 'convex/server';
-import { zid, zodToConvex } from 'convex-helpers/server/zod';
+import { zid, zodToConvex } from 'convex-helpers/server/zod4';
 import { z } from 'zod';
 
 import { getBaseDbModel } from '../shared/models';

convex/leaderboards/models.ts

@@ -1,5 +1,5 @@
 import { defineTable } from 'convex/server';
-import { zid, zodToConvex } from 'convex-helpers/server/zod';
+import { zid, zodToConvex } from 'convex-helpers/server/zod4';
 import { z } from 'zod';
 
 import { getBaseDbModel } from '../shared/models';

convex/leaderboards/queries.ts

@@ -1,6 +1,6 @@
 import { type NamedTableInfo, type Query } from 'convex/server';
 import { ConvexError } from 'convex/values';
-import { zid } from 'convex-helpers/server/zod';
+import { zid } from 'convex-helpers/server/zod4';
 import { z } from 'zod';
 
 import { internal } from '../_generated/api';
@@ -32,7 +32,7 @@ export const list = query({
       .collect();
 
     const userJoinedLeaderboards =
-      type === leaderboardType.Enum.private
+      type === leaderboardType.enum.private
         ? leaderboards.filter((leaderboard) => leaderboard.users?.includes(userId))
         : leaderboards;
 
@@ -42,7 +42,7 @@ export const list = query({
       const leaderboardEntries = await ctx.db
         .query('leaderboardEntries')
         .withIndex('by_leaderboard_recordedAt', (q) => {
-          if (range === leaderboardRange.Enum.weekly) {
+          if (range === leaderboardRange.enum.weekly) {
             const { lastMonday, nextSunday } = weekBounds(timestamp);
             return q
               .eq('leaderboardId', leaderboard._id)
@@ -103,7 +103,7 @@ export const readGlobalLeaderboard = query({
 
     const globalLeaderboard = await ctx.db
       .query('leaderboards')
-      .withIndex('by_type', (q) => q.eq('type', leaderboardType.Enum.global))
+      .withIndex('by_type', (q) => q.eq('type', leaderboardType.enum.global))
       .unique();
 
     if (!globalLeaderboard) {
@@ -112,7 +112,7 @@ export const readGlobalLeaderboard = query({
 
     let leaderboardEntriesBaseQuery: Query<NamedTableInfo<DataModel, 'leaderboardEntries'>>;
 
-    if (range === leaderboardRange.Enum.weekly) {
+    if (range === leaderboardRange.enum.weekly) {
       const { lastMonday, nextSunday } = weekBounds(timestamp);
 
       leaderboardEntriesBaseQuery = ctx.db
@@ -180,7 +180,7 @@ export const populateLeaderboardWithExistingRecords = internalMutation({
   async handler(ctx, { userId, leaderboardId }) {
     const globalLeaderboard = await ctx.db
       .query('leaderboards')
-      .withIndex('by_type', (q) => q.eq('type', leaderboardType.Enum.global))
+      .withIndex('by_type', (q) => q.eq('type', leaderboardType.enum.global))
       .unique();
     if (!globalLeaderboard) {
       throw new ConvexError({ message: 'Global leaderboard not found', code: 500 });
@@ -222,7 +222,7 @@ export const createPrivateLeaderboard = mutation({
 
       const createdLeaderboardId = await ctx.db.insert('leaderboards', {
         name: data.name,
-        type: leaderboardType.Enum.private,
+        type: leaderboardType.enum.private,
         creatorId: normalizedUserId,
         users: [normalizedUserId],
         inviteCode,
@@ -323,7 +323,7 @@ export const deletePrivateLeaderboard = mutation({
       throw new ConvexError({ message: 'Leaderboard not found.', code: 404 });
     }
 
-    if (leaderboard.type === leaderboardType.Enum.global) {
+    if (leaderboard.type === leaderboardType.enum.global) {
       throw new ConvexError({ message: 'Cannot perform delete opration on a global leaderboard.', code: 403 });
     }
 

convex/notifications/queries.ts

@@ -1,5 +1,5 @@
 import { ConvexError } from 'convex/values';
-import { zid } from 'convex-helpers/server/zod';
+import { zid } from 'convex-helpers/server/zod4';
 import { z } from 'zod';
 
 import { mutation, query } from '../shared/queries';

convex/puzzleGuessAttempts/helpers.ts

@@ -5,5 +5,5 @@ export function isAttemptCorrect(attempt?: Pick<PuzzleGuessAttempt, 'checkedLett
     return false;
   }
 
-  return attempt.checkedLetters.every((letter) => letter.status === checkedLetterStatus.Enum.correct);
+  return attempt.checkedLetters.every((letter) => letter.status === checkedLetterStatus.enum.correct);
 }

convex/puzzleGuessAttempts/models.ts

@@ -1,5 +1,5 @@
 import { defineTable } from 'convex/server';
-import { zodToConvex } from 'convex-helpers/server/zod';
+import { zodToConvex } from 'convex-helpers/server/zod4';
 import { z } from 'zod';
 
 import { getBaseDbModel } from '../shared/models';

convex/puzzleGuessAttempts/queries.ts

@@ -1,5 +1,5 @@
 import { ConvexError } from 'convex/values';
-import { zid } from 'convex-helpers/server/zod';
+import { zid } from 'convex-helpers/server/zod4';
 import { z } from 'zod';
 
 import { checkWordleAttempt } from '@/utils/words';

convex/puzzles/internal.ts

@@ -22,7 +22,7 @@ export const createDailyPuzzle = internalMutation({
     const word = pickRandomWord(words);
 
     await ctx.db.insert('puzzles', {
-      type: puzzleType.Enum.daily,
+      type: puzzleType.enum.daily,
       creatorId: null,
       solution: word,
       solvedBy: [],
@@ -48,7 +48,7 @@ export const sendReminderForDailyChallenge = internalMutation({
       .query('puzzles')
       .withIndex('by_type_year_month_day', (q) =>
         q
-          .eq('type', puzzleType.Enum.daily)
+          .eq('type', puzzleType.enum.daily)
           .eq('year', today.getFullYear())
           .eq('month', today.getMonth() + 1)
           .eq('day', today.getDate())

convex/puzzles/models.ts

@@ -1,5 +1,5 @@
 import { defineTable } from 'convex/server';
-import { zodToConvex } from 'convex-helpers/server/zod';
+import { zodToConvex } from 'convex-helpers/server/zod4';
 import { z } from 'zod';
 
 import { puzzleGuessAttemptModel } from '../puzzleGuessAttempts/models';

convex/puzzles/queries.ts

@@ -1,5 +1,5 @@
 import { ConvexError } from 'convex/values';
-import { zid } from 'convex-helpers/server/zod';
+import { zid } from 'convex-helpers/server/zod4';
 import { z } from 'zod';
 
 import { pickRandomWord } from '@/utils/words';
@@ -41,7 +41,7 @@ export const list = query({
 
     const baseQuery = ctx.db.query('puzzles');
     const indexedQuery =
-      type === puzzleType.Enum.daily
+      type === puzzleType.enum.daily
         ? baseQuery.withIndex('by_type', (q) => q.eq('type', type).lte('_creationTime', currentDate.getTime()))
         : baseQuery.withIndex('by_type_creator', (q) => q.eq('type', type).eq('creatorId', normalizedUserId));
 
@@ -76,7 +76,7 @@ export const readUserActiveTrainingPuzzle = query({
 
     const userTrainingPuzzle = await ctx.db
       .query('puzzles')
-      .withIndex('by_type_creator', (q) => q.eq('type', puzzleType.Enum.training).eq('creatorId', normalizedUserId))
+      .withIndex('by_type_creator', (q) => q.eq('type', puzzleType.enum.training).eq('creatorId', normalizedUserId))
       .order('desc')
       .first();
 
@@ -92,7 +92,7 @@ export const readActiveDailyPuzzle = query({
       .query('puzzles')
       .withIndex('by_type_year_month_day', (q) =>
         q
-          .eq('type', puzzleType.Enum.daily)
+          .eq('type', puzzleType.enum.daily)
           .eq('year', date.getFullYear())
           .eq('month', date.getMonth() + 1)
           .eq('day', date.getDate())
@@ -113,7 +113,7 @@ export const readUserPuzzlesStatistics = query({
     }
 
     const basePuzzlesQuery =
-      type === puzzleType.Enum.daily
+      type === puzzleType.enum.daily
         ? ctx.db.query('puzzles').withIndex('by_type', (q) => q.eq('type', type))
         : ctx.db.query('puzzles').withIndex('by_type_creator', (q) => q.eq('type', type).eq('creatorId', userId));
 
@@ -150,7 +150,7 @@ export const readUserPuzzlesStatistics = query({
       const numOfAttempts = attempts.length;
       const lastAttempt = attempts.at(-1);
       const isLastAttemptCorrect = lastAttempt?.checkedLetters.every(
-        (checkedLetter) => checkedLetter.status === checkedLetterStatus.Enum.correct
+        (checkedLetter) => checkedLetter.status === checkedLetterStatus.enum.correct
       );
 
       if (isLastAttemptCorrect) {
@@ -192,7 +192,7 @@ export const createTrainingPuzzle = mutation({
     const word = pickRandomWord(words);
 
     const puzzleId = await ctx.db.insert('puzzles', {
-      type: puzzleType.Enum.training,
+      type: puzzleType.enum.training,
       creatorId: userId,
       solution: word,
       solvedBy: [],
@@ -272,7 +272,7 @@ export const markAsSolved = mutation({
       });
     }
 
-    if (puzzle.type === puzzleType.Enum.daily) {
+    if (puzzle.type === puzzleType.enum.daily) {
       const globalLeaderboard = await ctx.db
         .query('leaderboards')
         .withIndex('by_type', (q) => q.eq('type', 'global'))

convex/shared/models.ts

@@ -1,4 +1,4 @@
-import { zid } from 'convex-helpers/server/zod';
+import { zid } from 'convex-helpers/server/zod4';
 import { z } from 'zod';
 
 export const getBaseDbModel = <const T extends string>(tablename: T) =>

convex/shared/queries.ts

@@ -1,5 +1,5 @@
 import { NoOp } from 'convex-helpers/server/customFunctions';
-import { zCustomQuery, zCustomAction, zCustomMutation } from 'convex-helpers/server/zod';
+import { zCustomQuery, zCustomAction, zCustomMutation } from 'convex-helpers/server/zod4';
 
 import {
   query as baseQuery,

convex/userPuzzleStatistics/internal.ts

@@ -15,7 +15,7 @@ export const readAllUsersQuery = internalQuery({
 export const populateForUser = internalMutation({
   args: { id: v.id('users') },
   async handler(ctx, { id }) {
-    for (const type of [puzzleType.Enum.daily, puzzleType.Enum.training]) {
+    for (const type of [puzzleType.enum.daily, puzzleType.enum.training]) {
       const existingUserStatistics = await ctx.db
         .query('userPuzzleStatistics')
         .withIndex('by_user_puzzle_type', (q) => q.eq('userId', id).eq('puzzleType', type))
@@ -25,7 +25,7 @@ export const populateForUser = internalMutation({
       }
 
       const basePuzzlesQuery =
-        type === puzzleType.Enum.daily
+        type === puzzleType.enum.daily
           ? ctx.db.query('puzzles').withIndex('by_type', (q) => q.eq('type', type))
           : ctx.db.query('puzzles').withIndex('by_type_creator', (q) => q.eq('type', type).eq('creatorId', id));
       const allPuzzles = await basePuzzlesQuery.order('desc').collect();
@@ -59,7 +59,7 @@ export const populateForUser = internalMutation({
         const numOfAttempts = attempts.length;
         const lastAttempt = attempts.at(-1);
         const isLastAttemptCorrect = lastAttempt?.checkedLetters.every(
-          (checkedLetter) => checkedLetter.status === checkedLetterStatus.Enum.correct
+          (checkedLetter) => checkedLetter.status === checkedLetterStatus.enum.correct
         );
 
         if (isLastAttemptCorrect) {

convex/userPuzzleStatistics/models.ts

@@ -1,5 +1,5 @@
 import { defineTable } from 'convex/server';
-import { zid, zodToConvex } from 'convex-helpers/server/zod';
+import { zid, zodToConvex } from 'convex-helpers/server/zod4';
 import { z } from 'zod';
 
 import { puzzleType } from '../puzzles/models';

convex/userPuzzleStatistics/queries.ts

@@ -1,4 +1,4 @@
-import { zid } from 'convex-helpers/server/zod';
+import { zid } from 'convex-helpers/server/zod4';
 
 import { puzzleType } from '../puzzles/models';
 import { query } from '../shared/queries';

convex/users/models.ts

@@ -1,5 +1,5 @@
 import { defineTable } from 'convex/server';
-import { zodToConvex } from 'convex-helpers/server/zod';
+import { zodToConvex } from 'convex-helpers/server/zod4';
 import { z } from 'zod';
 
 import { getBaseDbModel } from '../shared/models';
@@ -13,13 +13,13 @@ export type User = z.infer<typeof userModel>;
 export const createUserModel = z.object({
   nickname: z
     .string()
-    .min(3, { message: 'Vzdevek mora vsebovati vsaj 3 znake.' })
-    .max(20, { message: 'Vzdevek lahko vsebuje največ 20 znakov.' })
+    .min(3, { error: 'Vzdevek mora vsebovati vsaj 3 znake.' })
+    .max(20, { error: 'Vzdevek lahko vsebuje največ 20 znakov.' })
     .regex(/^(?!.*(@|https?:\/\/|www\.|\.\w{2,})).*$/, {
-      message: 'Vzdevek ne sme vsebovati spletnih ali e-poštnih naslovov.',
+      error: 'Vzdevek ne sme vsebovati spletnih ali e-poštnih naslovov.',
     })
     .regex(/[a-zA-Z0-9]/, {
-      message: 'Vzdevek mora vsebovati vsaj eno črko ali številko.',
+      error: 'Vzdevek mora vsebovati vsaj eno črko ali številko.',
     }),
 });
 export type CreateUser = z.infer<typeof createUserModel>;

convex/users/queries.ts

@@ -1,5 +1,5 @@
 import { ConvexError } from 'convex/values';
-import { zid } from 'convex-helpers/server/zod';
+import { zid } from 'convex-helpers/server/zod4';
 import { z } from 'zod';
 
 import { internal } from '../_generated/api';
@@ -87,7 +87,7 @@ export const cleanupUserData = internalMutation({
 
     const joinedLeaderboardsQuery = ctx.db
       .query('leaderboards')
-      .withIndex('by_type', (q) => q.eq('type', leaderboardType.Enum.private));
+      .withIndex('by_type', (q) => q.eq('type', leaderboardType.enum.private));
     for await (const joinedLeaderboard of joinedLeaderboardsQuery) {
       await ctx.db.patch(joinedLeaderboard._id, { users: joinedLeaderboard.users?.filter((userId) => userId !== id) });
     }
@@ -101,7 +101,7 @@ export const cleanupUserData = internalMutation({
 
     const puzzlesQuery = ctx.db
       .query('puzzles')
-      .withIndex('by_type_creator', (q) => q.eq('type', puzzleType.Enum.training).eq('creatorId', id));
+      .withIndex('by_type_creator', (q) => q.eq('type', puzzleType.enum.training).eq('creatorId', id));
     for await (const puzzle of puzzlesQuery) {
       await ctx.db.delete(puzzle._id);
     }

eslint.config.js

@@ -9,7 +9,6 @@ export default defineConfig([
   eslintPluginPrettierRecommended,
   {
     files: ['**/*.ts', '**/*.tsx'],
-    ignores: ['convex/_generated/**'],
     plugins: {
       'unused-imports': eslintPluginUnusedImports,
       'import-x': importX,
@@ -55,6 +54,6 @@ export default defineConfig([
     },
   },
   {
-    ignores: ['dist/*'],
+    ignores: ['dist/*', 'convex/_generated/**'],
   },
 ]);

package.json

@@ -82,7 +82,7 @@
     "require-from-string": "^2.0.2",
     "sucrase": "^3.35.1",
     "usehooks-ts": "^3.1.1",
-    "zod": "^3.25.76"
+    "zod": "^4.3.6"
   },
   "devDependencies": {
     "@babel/core": "^7.28.3",