Upgrade to Zod 4

docs/assets.md

@@ -7,7 +7,7 @@ files:
   - imports/server/lookupUrl.ts
   - imports/server/models/Blobs.ts
   - imports/server/publications/blobMappingsAll.ts
-updated: 2026-02-20
+updated: 2026-02-21
 ---
 
 # Custom Asset Pipeline

docs/google-drive.md

@@ -35,7 +35,7 @@ files:
   - imports/server/setup.ts
   - private/google-script/cookie-test.html
   - private/google-script/main.js
-updated: 2026-04-14T07:38:00Z
+updated: 2026-04-30T00:00:00Z
 ---
 
 # Google Drive Integration

imports/lib/jobs/discordSyncRole.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { foreignKey } from "../models/customTypes";
+import { foreignKey } from "../typedModel/customTypes";
 import TypedJob from "./TypedJob";
 
 const discordSyncRole = new TypedJob("discord.syncRole", {

imports/lib/jobs/mergeUsers.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { foreignKey } from "../models/customTypes";
+import { foreignKey } from "../typedModel/customTypes";
 import TypedJob from "./TypedJob";
 
 const mergeUsers = new TypedJob("user.mergeUsers", {

imports/lib/jobs/purgeHunt.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { foreignKey } from "../models/customTypes";
+import { foreignKey } from "../typedModel/customTypes";
 import TypedJob from "./TypedJob";
 
 const purgeHunt = new TypedJob("hunt.purgeHunt", {

imports/lib/models/APIKeys.ts

@@ -1,8 +1,8 @@
 import { z } from "zod";
-import { foreignKey } from "./customTypes";
-import type { ModelType } from "./Model";
-import SoftDeletedModel from "./SoftDeletedModel";
-import withCommon from "./withCommon";
+import { foreignKey } from "../typedModel/customTypes";
+import type { ModelType } from "../typedModel/Model";
+import SoftDeletedModel from "../typedModel/SoftDeletedModel";
+import withCommon from "../typedModel/withCommon";
 
 const APIKey = withCommon(
   z.object({

imports/lib/models/Announcements.ts

@@ -1,8 +1,8 @@
 import { z } from "zod";
-import { foreignKey, nonEmptyString } from "./customTypes";
-import type { ModelType } from "./Model";
-import SoftDeletedModel from "./SoftDeletedModel";
-import withCommon from "./withCommon";
+import { foreignKey, nonEmptyString } from "../typedModel/customTypes";
+import type { ModelType } from "../typedModel/Model";
+import SoftDeletedModel from "../typedModel/SoftDeletedModel";
+import withCommon from "../typedModel/withCommon";
 
 // A broadcast message from a hunt operator to be displayed
 // to all participants in the specified hunt.

imports/lib/models/BlobMappings.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
-import { nonEmptyString } from "./customTypes";
-import type { ModelType } from "./Model";
-import Model from "./Model";
+import { nonEmptyString } from "../typedModel/customTypes";
+import type { ModelType } from "../typedModel/Model";
+import Model from "../typedModel/Model";
 
 // Note that the _id is the asset name
 const BlobMapping = z.object({

imports/lib/models/BookmarkNotifications.ts

@@ -1,9 +1,9 @@
 import { z } from "zod";
 import type { Solvedness } from "../solvedness";
-import { answer, foreignKey } from "./customTypes";
-import type { ModelType } from "./Model";
-import SoftDeletedModel from "./SoftDeletedModel";
-import withCommon from "./withCommon";
+import { answer, foreignKey } from "../typedModel/customTypes";
+import type { ModelType } from "../typedModel/Model";
+import SoftDeletedModel from "../typedModel/SoftDeletedModel";
+import withCommon from "../typedModel/withCommon";
 
 const BookmarkNotificationSolvedness: z.ZodType<Solvedness> = z.enum([
   "noAnswers",

imports/lib/models/Bookmarks.ts

@@ -1,8 +1,8 @@
 import { z } from "zod";
-import { foreignKey } from "./customTypes";
-import type { ModelType } from "./Model";
-import SoftDeletedModel from "./SoftDeletedModel";
-import withCommon from "./withCommon";
+import { foreignKey } from "../typedModel/customTypes";
+import type { ModelType } from "../typedModel/Model";
+import SoftDeletedModel from "../typedModel/SoftDeletedModel";
+import withCommon from "../typedModel/withCommon";
 
 // Broadcast announcements that have not yet been viewed by a given
 // user

imports/lib/models/ChatMessages.ts

@@ -1,8 +1,9 @@
 import { z } from "zod";
-import { allowedEmptyString, foreignKey } from "./customTypes";
-import type { ModelType } from "./Model";
-import SoftDeletedModel from "./SoftDeletedModel";
-import withCommon from "./withCommon";
+import { allowedEmptyString, foreignKey } from "../typedModel/customTypes";
+import type { ModelType } from "../typedModel/Model";
+import { Url } from "../typedModel/regexes";
+import SoftDeletedModel from "../typedModel/SoftDeletedModel";
+import withCommon from "../typedModel/withCommon";
 
 const UserMentionBlock = z.object({
   type: z.literal("mention"),
@@ -18,7 +19,7 @@ export type ChatMessageRoleMentionNodeType = z.infer<typeof RoleMentionBlock>;
 
 const ImageBlock = z.object({
   type: z.literal("image"),
-  url: z.string().url(),
+  url: z.string().regex(Url),
 });
 export type ChatMessageImageNodeType = z.infer<typeof ImageBlock>;
 

imports/lib/models/ChatNotifications.ts

@@ -1,9 +1,9 @@
 import { z } from "zod";
+import { foreignKey } from "../typedModel/customTypes";
+import type { ModelType } from "../typedModel/Model";
+import SoftDeletedModel from "../typedModel/SoftDeletedModel";
+import withCommon from "../typedModel/withCommon";
 import { ChatMessageContent } from "./ChatMessages";
-import { foreignKey } from "./customTypes";
-import type { ModelType } from "./Model";
-import SoftDeletedModel from "./SoftDeletedModel";
-import withCommon from "./withCommon";
 
 // A notification triggered by a chat message sent by a user.
 const ChatNotification = withCommon(

imports/lib/models/DiscordAccount.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { nonEmptyString } from "./customTypes";
+import { nonEmptyString } from "../typedModel/customTypes";
 
 const DiscordAccount = z.object({
   id: nonEmptyString,

imports/lib/models/DiscordCache.ts

@@ -1,8 +1,8 @@
 import { z } from "zod";
-import { nonEmptyString, snowflake } from "./customTypes";
-import type { ModelType } from "./Model";
-import Model from "./Model";
-import withTimestamps from "./withTimestamps";
+import { nonEmptyString, snowflake } from "../typedModel/customTypes";
+import type { ModelType } from "../typedModel/Model";
+import Model from "../typedModel/Model";
+import withTimestamps from "../typedModel/withTimestamps";
 
 export const DiscordCacheSchema = withTimestamps(
   z.object({

imports/lib/models/DiscordRoleGrants.ts

@@ -1,8 +1,8 @@
 import { z } from "zod";
-import { foreignKey, snowflake } from "./customTypes";
-import type { ModelType } from "./Model";
-import SoftDeletedModel from "./SoftDeletedModel";
-import withCommon from "./withCommon";
+import { foreignKey, snowflake } from "../typedModel/customTypes";
+import type { ModelType } from "../typedModel/Model";
+import SoftDeletedModel from "../typedModel/SoftDeletedModel";
+import withCommon from "../typedModel/withCommon";
 
 const DiscordRoleGrant = withCommon(
   z.object({

imports/lib/models/DocumentActivities.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
-import { foreignKey } from "./customTypes";
-import type { ModelType } from "./Model";
-import Model from "./Model";
+import { foreignKey } from "../typedModel/customTypes";
+import type { ModelType } from "../typedModel/Model";
+import Model from "../typedModel/Model";
 
 /* DocumentActivityFields doesn't inherit from Base because it's created by the
    server, not by users */

imports/lib/models/Documents.ts

@@ -1,8 +1,8 @@
 import { z } from "zod";
-import { foreignKey, nonEmptyString } from "./customTypes";
-import type { ModelType } from "./Model";
-import SoftDeletedModel from "./SoftDeletedModel";
-import withCommon from "./withCommon";
+import { foreignKey, nonEmptyString } from "../typedModel/customTypes";
+import type { ModelType } from "../typedModel/Model";
+import SoftDeletedModel from "../typedModel/SoftDeletedModel";
+import withCommon from "../typedModel/withCommon";
 
 const DocumentSchema = withCommon(
   z

imports/lib/models/FeatureFlags.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
-import type { ModelType } from "./Model";
-import SoftDeletedModel from "./SoftDeletedModel";
-import withCommon from "./withCommon";
+import type { ModelType } from "../typedModel/Model";
+import SoftDeletedModel from "../typedModel/SoftDeletedModel";
+import withCommon from "../typedModel/withCommon";
 
 export const FlagNames = [
   "disable.dingwords",

imports/lib/models/FolderPermissions.ts

@@ -1,15 +1,15 @@
 import { z } from "zod";
-import { foreignKey, nonEmptyString } from "./customTypes";
-import type { ModelType } from "./Model";
-import SoftDeletedModel from "./SoftDeletedModel";
-import withCommon from "./withCommon";
+import { foreignKey, nonEmptyString } from "../typedModel/customTypes";
+import type { ModelType } from "../typedModel/Model";
+import SoftDeletedModel from "../typedModel/SoftDeletedModel";
+import withCommon from "../typedModel/withCommon";
 
 const FolderPermission = withCommon(
   z.object({
     folder: nonEmptyString,
     user: foreignKey,
     // This can change, so capture which one we gave permissions to
-    googleAccount: z.string().email(),
+    googleAccount: z.email(),
     // This is largely a legacy field, as we expect all new grants to use the
     // "commenter" permission (which results in correct attribution of Drive
     // activity), but we originally granted the "reader" permission instead

imports/lib/models/Guesses.ts

@@ -1,8 +1,8 @@
 import { z } from "zod";
-import { answer, foreignKey, nonEmptyString } from "./customTypes";
-import type { ModelType } from "./Model";
-import SoftDeletedModel from "./SoftDeletedModel";
-import withCommon from "./withCommon";
+import { answer, foreignKey, nonEmptyString } from "../typedModel/customTypes";
+import type { ModelType } from "../typedModel/Model";
+import SoftDeletedModel from "../typedModel/SoftDeletedModel";
+import withCommon from "../typedModel/withCommon";
 
 // The state of this guess, as handled by the operators:
 // * 'pending' means "shows up in the operator queue"
@@ -30,10 +30,10 @@ const Guess = withCommon(
     guess: answer,
     // Whether this was forward solved (10), backwards solved (-10), or somewhere
     // in between (only optional in that older hunts won't have it)
-    direction: z.number().int().min(-10).max(10).optional(),
+    direction: z.int32().min(-10).max(10).optional(),
     // Submitted-evaluated probability that the answer is right (also only
     // optional on older hunts)
-    confidence: z.number().int().min(0).max(100).optional(),
+    confidence: z.int32().min(0).max(100).optional(),
     state: GuessStates,
     // Additional notes can be used by the operator either for sharing (e.g.)
     // additional information received from the puzzle (e.g. for an intermediate

imports/lib/models/Hunts.ts

@@ -1,9 +1,10 @@
 import { Match } from "meteor/check";
 import { z } from "zod";
-import { nonEmptyString, snowflake } from "./customTypes";
-import type { ModelType } from "./Model";
-import SoftDeletedModel from "./SoftDeletedModel";
-import withCommon from "./withCommon";
+import { nonEmptyString, snowflake } from "../typedModel/customTypes";
+import type { ModelType } from "../typedModel/Model";
+import { Url } from "../typedModel/regexes";
+import SoftDeletedModel from "../typedModel/SoftDeletedModel";
+import withCommon from "../typedModel/withCommon";
 
 export const SavedDiscordObjectFields = z.object({
   id: snowflake,
@@ -36,7 +37,7 @@ const EditableHunt = z.object({
   submitTemplate: nonEmptyString.optional(),
   // If provided, then this is a link to the overall root hunt homepage and will
   // be shown in the PuzzleListPage navbar.
-  homepageUrl: nonEmptyString.url().optional(),
+  homepageUrl: z.string().regex(Url).optional(),
   // If provided, then announcements will be synced to this Discord channel
   announcementDiscordChannel: SavedDiscordObjectFields.optional(),
   // If provided, this is an object containing a Discord channel id and cached

imports/lib/models/InvitationCodes.ts

@@ -1,8 +1,8 @@
 import { z } from "zod";
-import { foreignKey, nonEmptyString } from "./customTypes";
-import type { ModelType } from "./Model";
-import SoftDeletedModel from "./SoftDeletedModel";
-import withCommon from "./withCommon";
+import { foreignKey, nonEmptyString } from "../typedModel/customTypes";
+import type { ModelType } from "../typedModel/Model";
+import SoftDeletedModel from "../typedModel/SoftDeletedModel";
+import withCommon from "../typedModel/withCommon";
 
 // Invitation codes that can be used to join a hunt.
 // These take the place of direct (user-to-user) invitations.

imports/lib/models/Jobs.ts

@@ -1,7 +1,11 @@
 import { z } from "zod";
-import { createdTimestamp, foreignKey, nonEmptyString } from "./customTypes";
-import type { ModelType } from "./Model";
-import Model from "./Model";
+import {
+  createdTimestamp,
+  foreignKey,
+  nonEmptyString,
+} from "../typedModel/customTypes";
+import type { ModelType } from "../typedModel/Model";
+import Model from "../typedModel/Model";
 
 const Job = z.object({
   type: nonEmptyString,
@@ -12,8 +16,8 @@ const Job = z.object({
   completedAt: z.date().optional(),
   result: z.record(z.string(), z.unknown()).optional(),
   error: nonEmptyString.optional(),
-  attempts: z.number().int().nonnegative().default(0),
-  maxAttempts: z.number().int().positive(),
+  attempts: z.int32().nonnegative().default(0),
+  maxAttempts: z.int32().positive(),
   runAfter: z.date().optional(),
   deleteAfter: z.date().optional(),
   createdBy: foreignKey.optional(),

imports/lib/models/MergeOperations.ts

@@ -1,9 +1,9 @@
 import { z } from "zod";
-import { foreignKey, nonEmptyString } from "./customTypes";
+import { foreignKey, nonEmptyString } from "../typedModel/customTypes";
+import type { ModelType } from "../typedModel/Model";
+import Model from "../typedModel/Model";
+import withCommon from "../typedModel/withCommon";
 import DiscordAccount from "./DiscordAccount";
-import type { ModelType } from "./Model";
-import Model from "./Model";
-import withCommon from "./withCommon";
 
 // Audit trail for user merge operations. Each record tracks a merge of
 // participants[0] (source, going away) into participants[1] (target,