Migrate zod and associated dependencies to v4 (#193)

Author: devksingh4

.gitignore

@@ -143,3 +143,4 @@ __pycache__
 /playwright/.cache/
 dist_devel/
 !src/ui/pages/logs
+src/api/package.lambda.json

eslint.config.mjs

@@ -70,6 +70,10 @@ export default defineConfig([
     files: ["**/*.test.ts", "**/*.testdata.ts"],
     rules: { "@typescript-eslint/no-explicit-any": "off" },
   },
+  {
+    files: ["src/api/build.js"],
+    rules: { "import/extensions": "off" },
+  },
   {
     files: ["src/ui/*", "src/ui/**/*"],
     rules: {

package.json

@@ -12,7 +12,7 @@
     "postinstall": "npm run setup",
     "setup": "git config blame.ignoreRevsFile .git-blame-ignore-revs",
     "build": "concurrently --names 'api,ui' 'yarn workspace infra-core-api run build' 'yarn workspace infra-core-ui run build'",
-    "postbuild": "yarn lockfile-manage",
+    "postbuild": "node src/api/createLambdaPackage.js && yarn lockfile-manage",
     "dev": "cross-env DISABLE_AUDIT_LOG=true concurrently --names 'api,ui' 'yarn workspace infra-core-api run dev' 'yarn workspace infra-core-ui run dev'",
     "lockfile-manage": "synp --with-workspace --source-file yarn.lock",
     "postlockfile-manage": "cp package-lock.json dist/lambda/ && cp package-lock.json dist/sqsConsumer/ && cp src/api/package.lambda.json dist/lambda/package.json && cp src/api/package.lambda.json dist/sqsConsumer/package.json && rm package-lock.json",
@@ -48,7 +48,7 @@
     "@typescript-eslint/eslint-plugin": "^8.0.1",
     "@typescript-eslint/parser": "^8.0.1",
     "@vitejs/plugin-react": "^4.3.1",
-    "@vitest/coverage-istanbul": "3.1.2",
+    "@vitest/coverage-istanbul": "^3.1.2",
     "@vitest/ui": "^3.1.2",
     "aws-sdk-client-mock": "^4.1.0",
     "concurrently": "^9.1.2",
@@ -86,10 +86,10 @@
     "typescript": "^5.8.3",
     "typescript-eslint": "^8.31.0",
     "vite-tsconfig-paths": "^5.0.1",
-    "vitest": "^3.1.2",
+    "vitest": "^3.2.4",
     "yarn-upgrade-all": "^0.7.5"
   },
   "resolutions": {
     "pdfjs-dist": "^4.8.69"
   }
-}
+}

src/api/build.js

@@ -1,6 +1,7 @@
 import esbuild from "esbuild";
 import { resolve } from "path";
 import { copy } from "esbuild-plugin-copy";
+import { packagesToTransfer } from "./createLambdaPackage.js";
 
 const commonParams = {
   bundle: true,
@@ -15,18 +16,7 @@ const commonParams = {
   target: "es2022", // Target ES2022
   sourcemap: false,
   platform: "node",
-  external: [
-    "aws-sdk",
-    "moment-timezone",
-    "passkit-generator",
-    "fastify",
-    "zod",
-    "zod-openapi",
-    "@fastify/swagger",
-    "@fastify/swagger-ui",
-    "argon2",
-    "ioredis",
-  ],
+  external: ["aws-sdk", ...packagesToTransfer],
   alias: {
     "moment-timezone": resolve(
       process.cwd(),
@@ -41,7 +31,6 @@ const commonParams = {
       const require = topLevelCreateRequire(import.meta.url);
       const __filename = fileURLToPath(import.meta.url);
       const __dirname = path.dirname(__filename);
-      import "zod-openapi/extend";
     `.trim(),
   }, // Banner for compatibility with CommonJS
   plugins: [
@@ -60,7 +49,6 @@ const commonParams = {
       },
     }),
   ],
-  inject: [resolve(process.cwd(), "./zod-openapi-patch.js")],
 };
 esbuild
   .build({

src/api/components/index.ts

@@ -1,13 +1,13 @@
 import { AppRoles } from "common/roles.js";
 import { FastifyZodOpenApiSchema } from "fastify-zod-openapi";
-import { z } from "zod";
+import * as z from "zod/v4";
 
 export const ts = z.coerce
   .number()
   .min(0)
   .optional()
-  .openapi({ description: "Staleness bound", example: 0 });
-export const groupId = z.string().min(1).openapi({
+  .meta({ description: "Staleness bound", example: 0 });
+export const groupId = z.string().min(1).meta({
   description: "Entra ID Group ID",
   example: "d8cbb7c9-2f6d-4b7e-8ba6-b54f8892003b",
 });

src/api/createLambdaPackage.js

@@ -0,0 +1,43 @@
+import { readFile, writeFile } from "node:fs/promises";
+function getPath() {
+  const result = new URL(import.meta.url);
+  const pathname = result.pathname;
+  const pathArray = pathname.split("/");
+  const basename = pathArray.pop();
+  const dirname = pathArray.join("/");
+
+  return { pathname, dirname, basename };
+}
+// These are packages not bundled into the JS file by esbuild
+export const packagesToTransfer = [
+  "moment-timezone",
+  "passkit-generator",
+  "fastify",
+  "@fastify/swagger",
+  "@fastify/swagger-ui",
+  "zod",
+  "argon2",
+  "ioredis",
+];
+const filePath = `${getPath().dirname}/package.json`;
+const writeFilePath = `${getPath().dirname}/package.lambda.json`;
+const packageJson = JSON.parse((await readFile(filePath)).toString());
+const basePackageJson = {
+  name: "infra-core-api",
+  version: "1.0.0",
+  description: "",
+  main: "index.js",
+  author: "ACM@UIUC",
+  license: "BSD-3-Clause",
+  type: "module",
+  dependencies: {},
+  devDependencies: {},
+};
+for (const key in packageJson.dependencies) {
+  if (packagesToTransfer.includes(key)) {
+    const version = packageJson.dependencies[key];
+    basePackageJson.dependencies[key] = version;
+  }
+}
+const str = JSON.stringify(basePackageJson);
+await writeFile(writeFilePath, str);

src/api/esbuild.config.js

@@ -35,7 +35,6 @@ const buildOptions = {
       const require = topLevelCreateRequire(import.meta.url);
       const __filename = fileURLToPath(import.meta.url);
       const __dirname = path.dirname(__filename);
-      import "zod-openapi/extend";
     `.trim(),
   }, // Banner for compatibility with CommonJS
   plugins: [

src/api/functions/auditLog.ts

@@ -20,11 +20,14 @@ function buildMarshalledAuditLogItem(entry: AuditLogEntry) {
   const expireAt =
     timestamp + Math.floor((RETENTION_DAYS * 24 * 60 * 60 * 1000) / 1000);
 
-  return marshall({
-    ...entry,
-    createdAt: timestamp,
-    expireAt,
-  });
+  return marshall(
+    {
+      ...entry,
+      createdAt: timestamp,
+      expireAt,
+    },
+    { removeUndefinedValues: true },
+  );
 }
 
 export async function createAuditLogEntry({

src/api/functions/ses.ts

@@ -15,7 +15,7 @@ export function generateMembershipEmailCommand(
   senderEmail: string,
   attachmentBuffer: ArrayBufferLike,
 ): SendRawEmailCommand {
-  const encodedAttachment = encode(attachmentBuffer);
+  const encodedAttachment = encode(attachmentBuffer as ArrayBuffer);
   const boundary = "----BoundaryForEmail";
 
   const emailTemplate = `
@@ -147,7 +147,7 @@ export function generateSalesEmail(
   senderEmail: string,
   imageBuffer: ArrayBufferLike,
 ): SendRawEmailCommand {
-  const encodedImage = encode(imageBuffer);
+  const encodedImage = encode(imageBuffer as ArrayBuffer);
   const boundary = "----BoundaryForEmail";
 
   const subject = `Your ${payload.type === "merch" ? "order" : "ticket"} has been confirmed!`;

src/api/functions/validation.ts

@@ -1,4 +1,4 @@
-import { z } from "zod";
+import * as z from "zod/v4";
 
 export function validateEmail(email: string): boolean {
   const emailSchema = z.string().email();