Skip to content

A self-hostable bookmark-everything app (links, notes and images) with AI-based automatic tagging and full text search

deps: upgrade to zod 4 (#2689)

Mohamed Bassemfa24e42efeab
diff --git a/apps/browser-extension/package.json b/apps/browser-extension/package.json
index d1421ab5..a88fd01d 100644
--- a/apps/browser-extension/package.json
+++ b/apps/browser-extension/package.json
@@ -38,7 +38,7 @@
"superjson": "^2.2.1",
"tailwind-merge": "^2.2.1",
"tailwindcss-animate": "^1.0.7",
- "zod": "^3.24.4"
+ "zod": "^4.0.0"
},
"devDependencies": {
"@crxjs/vite-plugin": "2.2.0",
diff --git a/apps/mcp/package.json b/apps/mcp/package.json
index bc555bb0..3df35507 100644
--- a/apps/mcp/package.json
+++ b/apps/mcp/package.json
@@ -37,8 +37,8 @@
},
"dependencies": {
"@karakeep/sdk": "workspace:*",
- "@modelcontextprotocol/sdk": "^1.9.0",
+ "@modelcontextprotocol/sdk": "^1.29.0",
"turndown": "^7.2.0",
- "zod": "^3.24.4"
+ "zod": "^4.0.0"
}
}
diff --git a/apps/mcp/src/bookmarks.ts b/apps/mcp/src/bookmarks.ts
index fd6498fd..0968207f 100644
--- a/apps/mcp/src/bookmarks.ts
+++ b/apps/mcp/src/bookmarks.ts
@@ -115,20 +115,18 @@ mcpServer.tool(
},
async ({ title, type, content }): Promise<CallToolResult> => {
const res = await karakeepClient.POST(`/bookmarks`, {
- body: (
- {
- link: {
- type: "link",
- title,
- url: content,
- },
- text: {
- type: "text",
- title,
- text: content,
- },
- } as const
- )[type],
+ body:
+ type === "link"
+ ? {
+ type: "link",
+ title,
+ url: content,
+ }
+ : {
+ type: "text",
+ title,
+ text: content,
+ },
});
if (!res.data) {
return toMcpToolError(res.error);
diff --git a/apps/mcp/src/tags.ts b/apps/mcp/src/tags.ts
index da651a40..57f1c3ba 100644
--- a/apps/mcp/src/tags.ts
+++ b/apps/mcp/src/tags.ts
@@ -19,7 +19,7 @@ mcpServer.tool(
},
},
body: {
- tags: tagsToAttach.map((tag) => ({ tagName: tag })),
+ tags: tagsToAttach.map((tag: string) => ({ tagName: tag })),
},
});
if (res.error) {
@@ -51,7 +51,7 @@ mcpServer.tool(
},
},
body: {
- tags: tagsToDetach.map((tag) => ({ tagName: tag })),
+ tags: tagsToDetach.map((tag: string) => ({ tagName: tag })),
},
});
if (res.error) {
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
index c0295c17..fbcc971c 100644
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -78,7 +78,7 @@
"react-native-worklets": "0.5.1",
"sonner-native": "^0.22.2",
"tailwind-merge": "^2.2.1",
- "zod": "^3.24.4",
+ "zod": "^4.0.0",
"zustand": "^5.0.5"
},
"devDependencies": {
diff --git a/apps/web/components/dashboard/bookmarks/BulkManageListsModal.tsx b/apps/web/components/dashboard/bookmarks/BulkManageListsModal.tsx
index 1d4f5814..a918529e 100644
--- a/apps/web/components/dashboard/bookmarks/BulkManageListsModal.tsx
+++ b/apps/web/components/dashboard/bookmarks/BulkManageListsModal.tsx
@@ -36,7 +36,8 @@ export default function BulkManageListsModal({
}) {
const formSchema = z.object({
listId: z.string({
- required_error: "Please select a list",
+ error: (issue) =>
+ issue.input === undefined ? "Please select a list" : undefined,
}),
});
const form = useForm<z.infer<typeof formSchema>>({
diff --git a/apps/web/components/dashboard/bookmarks/ManageListsModal.tsx b/apps/web/components/dashboard/bookmarks/ManageListsModal.tsx
index 1fee0505..e4ff5e79 100644
--- a/apps/web/components/dashboard/bookmarks/ManageListsModal.tsx
+++ b/apps/web/components/dashboard/bookmarks/ManageListsModal.tsx
@@ -48,7 +48,8 @@ export default function ManageListsModal({
const { t } = useTranslation();
const formSchema = z.object({
listId: z.string({
- required_error: "Please select a list",
+ error: (issue) =>
+ issue.input === undefined ? "Please select a list" : undefined,
}),
});
const form = useForm<z.infer<typeof formSchema>>({
diff --git a/apps/web/components/signin/ResetPasswordForm.tsx b/apps/web/components/signin/ResetPasswordForm.tsx
index 571a09ae..655f1932 100644
--- a/apps/web/components/signin/ResetPasswordForm.tsx
+++ b/apps/web/components/signin/ResetPasswordForm.tsx
@@ -34,7 +34,7 @@ const resetPasswordSchema = z
.object({
confirmPassword: z.string(),
})
- .merge(zResetPasswordSchema.pick({ newPassword: true }))
+ .extend(zResetPasswordSchema.pick({ newPassword: true }).shape)
.refine((data) => data.newPassword === data.confirmPassword, {
message: "Passwords don't match",
path: ["confirmPassword"],
diff --git a/apps/web/package.json b/apps/web/package.json
index 6dc6cfd4..20639d7d 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -99,7 +99,7 @@
"sonner": "^2.0.7",
"superjson": "^2.2.1",
"tailwind-merge": "^2.2.1",
- "zod": "^3.24.4",
+ "zod": "^4.0.0",
"zustand": "^5.0.5"
},
"devDependencies": {
diff --git a/apps/workers/metascraper-plugins/metascraper-reddit.ts b/apps/workers/metascraper-plugins/metascraper-reddit.ts
index a5de5fe3..941c1a82 100644
--- a/apps/workers/metascraper-plugins/metascraper-reddit.ts
+++ b/apps/workers/metascraper-plugins/metascraper-reddit.ts
@@ -55,7 +55,9 @@ const redditPostSchema = z.object({
url_overridden_by_dest: z.string().optional(),
url: z.string().optional(),
thumbnail: z.string().optional(),
- media_metadata: z.record(redditMediaMetadataItemSchema).optional(),
+ media_metadata: z
+ .record(z.string(), redditMediaMetadataItemSchema)
+ .optional(),
author: z.string().optional(),
created_utc: z.number().optional(),
selftext: z.string().nullish(),
diff --git a/apps/workers/package.json b/apps/workers/package.json
index 0bcbd4f4..6959d9aa 100644
--- a/apps/workers/package.json
+++ b/apps/workers/package.json
@@ -27,7 +27,7 @@
"https-proxy-agent": "^7.0.6",
"ipaddr.js": "^2.2.0",
"jsdom": "^24.0.0",
- "liteque": "^0.7.0",
+ "liteque": "^0.8.0",
"lru-cache": "^11.2.2",
"metascraper": "^5.50.0",
"metascraper-amazon": "^5.50.0",
@@ -56,7 +56,7 @@
"tesseract.js": "^7.0.0",
"tsx": "^4.8.1",
"typescript": "^5.9",
- "zod": "^3.24.4"
+ "zod": "^4.0.0"
},
"devDependencies": {
"@types/archiver": "^7.0.0",
diff --git a/apps/workers/workers/crawlerWorker.ts b/apps/workers/workers/crawlerWorker.ts
index 4c3fb29c..3fc4648d 100644
--- a/apps/workers/workers/crawlerWorker.ts
+++ b/apps/workers/workers/crawlerWorker.ts
@@ -475,7 +475,7 @@ async function loadCookiesFromFile(): Promise<void> {
} catch (error) {
logger.error("Failed to read or parse cookies file:", error);
if (error instanceof z.ZodError) {
- logger.error("[Crawler] Invalid cookie file format:", error.errors);
+ logger.error("[Crawler] Invalid cookie file format:", error.issues);
} else {
logger.error("[Crawler] Failed to read or parse cookies file:", error);
}
diff --git a/apps/workers/workers/utils/parseHtmlSubprocessIpc.ts b/apps/workers/workers/utils/parseHtmlSubprocessIpc.ts
index acf4e2d7..cc87b457 100644
--- a/apps/workers/workers/utils/parseHtmlSubprocessIpc.ts
+++ b/apps/workers/workers/utils/parseHtmlSubprocessIpc.ts
@@ -6,18 +6,16 @@ export const parseSubprocessInputSchema = z.object({
jobId: z.string(),
});
-export const parseSubprocessMetadataSchema = z
- .object({
- title: z.string().nullish(),
- description: z.string().nullish(),
- image: z.string().nullish(),
- logo: z.string().nullish(),
- author: z.string().nullish(),
- publisher: z.string().nullish(),
- datePublished: z.string().nullish(),
- dateModified: z.string().nullish(),
- })
- .passthrough();
+export const parseSubprocessMetadataSchema = z.looseObject({
+ title: z.string().nullish(),
+ description: z.string().nullish(),
+ image: z.string().nullish(),
+ logo: z.string().nullish(),
+ author: z.string().nullish(),
+ publisher: z.string().nullish(),
+ datePublished: z.string().nullish(),
+ dateModified: z.string().nullish(),
+});
export const parseSubprocessOutputSchema = z.object({
metadata: parseSubprocessMetadataSchema,
diff --git a/packages/api/package.json b/packages/api/package.json
index ea12c7e6..fcd2f3cc 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -16,7 +16,7 @@
"@hono/otel": "^1.1.1",
"@hono/prometheus": "^1.0.2",
"@hono/trpc-server": "^0.4.2",
- "@hono/zod-validator": "^0.5.0",
+ "@hono/zod-validator": "^0.7.6",
"@karakeep/db": "workspace:*",
"@karakeep/shared": "workspace:*",
"@karakeep/shared-server": "workspace:*",
@@ -27,7 +27,7 @@
"hono": "^4.12.8",
"prom-client": "^15.1.3",
"rss": "^1.2.2",
- "zod": "^3.24.4"
+ "zod": "^4.0.0"
},
"devDependencies": {
"@karakeep/tsconfig": "workspace:^0.1.0",
diff --git a/packages/api/routes/bookmarks.ts b/packages/api/routes/bookmarks.ts
index e24d2ff8..3217243f 100644
--- a/packages/api/routes/bookmarks.ts
+++ b/packages/api/routes/bookmarks.ts
@@ -33,8 +33,8 @@ const app = new Hono()
favourited: zStringBool.optional(),
archived: zStringBool.optional(),
})
- .and(zGetBookmarkQueryParamsSchema)
- .and(zPagination),
+ .extend(zGetBookmarkQueryParamsSchema.shape)
+ .extend(zPagination.shape),
),
async (c) => {
const searchParams = c.req.valid("query");
@@ -69,7 +69,7 @@ const app = new Hono()
val ? { ver: 1 as const, offset: parseInt(val) } : undefined,
),
})
- .and(zGetBookmarkSearchParamsSchema),
+ .extend(zGetBookmarkSearchParamsSchema.shape),
),
async (c) => {
const searchParams = c.req.valid("query");
diff --git a/packages/api/routes/lists.ts b/packages/api/routes/lists.ts
index 33908629..a0457155 100644
--- a/packages/api/routes/lists.ts
+++ b/packages/api/routes/lists.ts
@@ -43,7 +43,10 @@ const app = new Hono()
})
.get(
"/:listId/bookmarks",
- zValidator("query", zPagination.and(zGetBookmarkQueryParamsSchema)),
+ zValidator(
+ "query",
+ zPagination.extend(zGetBookmarkQueryParamsSchema.shape),
+ ),
async (c) => {
const listId = c.req.param("listId");
const searchParams = c.req.valid("query");
diff --git a/packages/api/routes/tags.ts b/packages/api/routes/tags.ts
index 79e36e99..a4e05cff 100644
--- a/packages/api/routes/tags.ts
+++ b/packages/api/routes/tags.ts
@@ -72,7 +72,10 @@ const app = new Hono()
// GET /tags/[tagId]/bookmarks
.get(
"/:tagId/bookmarks",
- zValidator("query", zPagination.and(zGetBookmarkQueryParamsSchema)),
+ zValidator(
+ "query",
+ zPagination.extend(zGetBookmarkQueryParamsSchema.shape),
+ ),
async (c) => {
const tagId = c.req.param("tagId");
const searchParams = c.req.valid("query");
diff --git a/packages/api/utils/pagination.ts b/packages/api/utils/pagination.ts
index 12a0b950..52d861ea 100644
--- a/packages/api/utils/pagination.ts
+++ b/packages/api/utils/pagination.ts
@@ -12,7 +12,8 @@ export const zPagination = z.object({
const [id, createdAt] = val.split("_");
return { id, createdAt };
})
- .pipe(z.object({ id: z.string(), createdAt: z.coerce.date() }))
+ .transform(({ id, createdAt }) => ({ id, createdAt: new Date(createdAt) }))
+ .pipe(z.object({ id: z.string(), createdAt: z.date() }))
.optional(),
});
diff --git a/packages/api/utils/types.ts b/packages/api/utils/types.ts
index c1f342db..6fe9b880 100644
--- a/packages/api/utils/types.ts
+++ b/packages/api/utils/types.ts
@@ -8,20 +8,20 @@ export const zStringBool = z
.transform((val) => val === "true");
export const zIncludeContentSearchParamsSchema = z.object({
- includeContent: zStringBool.optional().default("false"),
+ includeContent: zStringBool.optional().prefault("false"),
});
export const zGetBookmarkQueryParamsSchema = z
.object({
sortOrder: zSortOrder
- .exclude([zSortOrder.Enum.relevance])
+ .exclude([zSortOrder.enum.relevance])
.optional()
- .default(zSortOrder.Enum.desc),
+ .default(zSortOrder.enum.desc),
})
- .merge(zIncludeContentSearchParamsSchema);
+ .extend(zIncludeContentSearchParamsSchema.shape);
export const zGetBookmarkSearchParamsSchema = z
.object({
- sortOrder: zSortOrder.optional().default(zSortOrder.Enum.relevance),
+ sortOrder: zSortOrder.optional().default(zSortOrder.enum.relevance),
})
- .merge(zIncludeContentSearchParamsSchema);
+ .extend(zIncludeContentSearchParamsSchema.shape);
diff --git a/packages/benchmarks/package.json b/packages/benchmarks/package.json
index 67b97d1b..f6ef7706 100644
--- a/packages/benchmarks/package.json
+++ b/packages/benchmarks/package.json
@@ -19,7 +19,7 @@
"p-limit": "^7.2.0",
"superjson": "^2.2.1",
"tinybench": "^6.0.0",
- "zod": "^3.24.4"
+ "zod": "^4.0.0"
},
"devDependencies": {
"@karakeep/tsconfig": "workspace:^0.1.0",
diff --git a/packages/e2e_tests/package.json b/packages/e2e_tests/package.json
index b40fa352..707e5924 100644
--- a/packages/e2e_tests/package.json
+++ b/packages/e2e_tests/package.json
@@ -21,7 +21,7 @@
"@karakeep/trpc": "workspace:^0.1.0",
"@trpc/client": "^11.9.0",
"superjson": "^2.2.1",
- "zod": "^3.24.4"
+ "zod": "^4.0.0"
},
"devDependencies": {
"@karakeep/tsconfig": "workspace:^0.1.0",
diff --git a/packages/open-api/index.ts b/packages/open-api/index.ts
index f8e5c7e5..6550a3a8 100644
--- a/packages/open-api/index.ts
+++ b/packages/open-api/index.ts
@@ -5,6 +5,8 @@ import {
OpenAPIRegistry,
} from "@asteasolutions/zod-to-openapi";
+import "./zod-extend";
+
import { registry as adminRegistry } from "./lib/admin";
import { registry as assetsRegistry } from "./lib/assets";
import { registry as backupsRegistry } from "./lib/backups";
diff --git a/packages/open-api/karakeep-openapi-spec.json b/packages/open-api/karakeep-openapi-spec.json
index 70358fe6..f728d9dc 100644
--- a/packages/open-api/karakeep-openapi-spec.json
+++ b/packages/open-api/karakeep-openapi-spec.json
@@ -98,6 +98,26 @@
"description": "The unique identifier of the feed.",
"example": "ieidlxygmwj87oxz5hxttoc8"
},
+ "PaginatedBookmarks": {
+ "type": "object",
+ "properties": {
+ "bookmarks": {
+ "type": "array",
+ "items": {
+ "$ref": "#/components/schemas/Bookmark"
+ }
+ },
+ "nextCursor": {
+ "type": "string",
+ "nullable": true,
+ "description": "Cursor for the next page, or null if no more results."
+ }
+ },
+ "required": [
+ "bookmarks",
+ "nextCursor"
+ ]
+ },
"Bookmark": {
"type": "object",
"properties": {
@@ -105,11 +125,13 @@
"type": "string"
},
"createdAt": {
- "type": "string"
+ "type": "string",
+ "format": "date-time"
},
"modifiedAt": {
"type": "string",
- "nullable": true
+ "nullable": true,
+ "format": "date-time"
},
"title": {
"type": "string",
@@ -127,7 +149,8 @@
"enum": [
"success",
"failure",
- "pending"
+ "pending",
+ null
]
},
"summarizationStatus": {
@@ -136,7 +159,8 @@
"enum": [
"success",
"failure",
- "pending"
+ "pending",
+ null
]
},
"note": {
@@ -158,7 +182,8 @@
"extension",
"singlefile",
"rss",
- "import"
+ "import",
+ null
]
},
"userId": {
@@ -254,7 +279,8 @@
},
"crawledAt": {
"type": "string",
- "nullable": true
+ "nullable": true,
+ "format": "date-time"
},
"crawlStatus": {
"type": "string",
@@ -262,7 +288,8 @@
"enum": [
"success",
"failure",
- "pending"
+ "pending",
+ null
]
},
"author": {
@@ -275,11 +302,13 @@
},
"datePublished": {
"type": "string",
- "nullable": true
+ "nullable": true,
+ "format": "date-time"
},
"dateModified": {
"type": "string",
- "nullable": true
+ "nullable": true,
+ "format": "date-time"
}
},
"required": [
@@ -418,26 +447,6 @@
"assets"
]
},
- "PaginatedBookmarks": {
- "type": "object",
- "properties": {
- "bookmarks": {
- "type": "array",
- "items": {
- "$ref": "#/components/schemas/Bookmark"
- }
- },
- "nextCursor": {
- "type": "string",
- "nullable": true,
- "description": "Cursor for the next page, or null if no more results."
- }
- },
- "required": [
- "bookmarks",
- "nextCursor"
- ]
- },
"Cursor": {
"type": "string",
"description": "Cursor from a previous response to fetch the next page."
@@ -554,7 +563,8 @@
"type": "string"
},
"createdAt": {
- "type": "string"
+ "type": "string",
+ "format": "date-time"
}
},
"required": [
@@ -646,7 +656,6 @@
"fileName"
]
},
- "File to be uploaded": {},
"Feed": {
"type": "object",
"properties": {
@@ -674,7 +683,8 @@
"enum": [
"success",
"failure",
- "pending"
+ "pending",
+ null
]
},
"lastFetchedAt": {
@@ -708,6 +718,7 @@
"$ref": "#/components/schemas/BookmarkId"
},
"required": true,
+ "description": "The unique identifier of the bookmark.",
"name": "bookmarkId",
"in": "path"
},
@@ -716,6 +727,7 @@
"$ref": "#/components/schemas/ListId"
},
"required": true,
+ "description": "The unique identifier of the list.",
"name": "listId",
"in": "path"
},
@@ -724,6 +736,7 @@
"$ref": "#/components/schemas/TagId"
},
"required": true,
+ "description": "The unique identifier of the tag.",
"name": "tagId",
"in": "path"
},
@@ -732,6 +745,7 @@
"$ref": "#/components/schemas/HighlightId"
},
"required": true,
+ "description": "The unique identifier of the highlight.",
"name": "highlightId",
"in": "path"
},
@@ -740,6 +754,7 @@
"$ref": "#/components/schemas/AssetId"
},
"required": true,
+ "description": "The unique identifier of the asset.",
"name": "assetId",
"in": "path"
},
@@ -748,6 +763,7 @@
"$ref": "#/components/schemas/BackupId"
},
"required": true,
+ "description": "The unique identifier of the backup.",
"name": "backupId",
"in": "path"
},
@@ -756,6 +772,7 @@
"$ref": "#/components/schemas/FeedId"
},
"required": true,
+ "description": "The unique identifier of the feed.",
"name": "feedId",
"in": "path"
}
@@ -906,7 +923,7 @@
},
"createdAt": {
"type": "string",
- "nullable": true
+ "format": "date-time"
},
"crawlPriority": {
"type": "string",
@@ -1369,7 +1386,7 @@
},
"createdAt": {
"type": "string",
- "nullable": true
+ "format": "date-time"
},
"url": {
"type": "string",
@@ -1389,11 +1406,13 @@
},
"datePublished": {
"type": "string",
- "nullable": true
+ "nullable": true,
+ "format": "date-time"
},
"dateModified": {
"type": "string",
- "nullable": true
+ "nullable": true,
+ "format": "date-time"
},
"text": {
"type": "string",
@@ -1420,11 +1439,13 @@
"type": "string"
},
"createdAt": {
- "type": "string"
+ "type": "string",
+ "format": "date-time"
},
"modifiedAt": {
"type": "string",
- "nullable": true
+ "nullable": true,
+ "format": "date-time"
},
"title": {
"type": "string",
@@ -1442,7 +1463,8 @@
"enum": [
"success",
"failure",
- "pending"
+ "pending",
+ null
]
},
"summarizationStatus": {
@@ -1451,7 +1473,8 @@
"enum": [
"success",
"failure",
- "pending"
+ "pending",
+ null
]
},
"note": {
@@ -1473,7 +1496,8 @@
"extension",
"singlefile",
"rss",
- "import"
+ "import",
+ null
]
},
"userId": {
@@ -1548,11 +1572,13 @@
"type": "string"
},
"createdAt": {
- "type": "string"
+ "type": "string",
+ "format": "date-time"
},
"modifiedAt": {
"type": "string",
- "nullable": true
+ "nullable": true,
+ "format": "date-time"
},
"title": {
"type": "string",
@@ -1570,7 +1596,8 @@
"enum": [
"success",
"failure",
- "pending"
+ "pending",
+ null
]
},
"summarizationStatus": {
@@ -1579,7 +1606,8 @@
"enum": [
"success",
"failure",
- "pending"
+ "pending",
+ null
]
},
"note": {
@@ -1601,7 +1629,8 @@
"extension",
"singlefile",
"rss",
- "import"
+ "import",
+ null
]
},
"userId": {
@@ -3784,7 +3813,8 @@
"extension",
"singlefile",
"rss",
- "import"
+ "import",
+ null
]
},
"count": {
@@ -3852,7 +3882,9 @@
"type": "object",
"properties": {
"file": {
- "$ref": "#/components/schemas/File to be uploaded"
+ "type": "string",
+ "description": "File to be uploaded",
+ "format": "binary"
}
},
"required": [
@@ -3944,6 +3976,7 @@
"example": "user_123"
},
"required": true,
+ "description": "The ID of the user to update.",
"name": "userId",
"in": "path"
}
@@ -4350,7 +4383,8 @@
"nullable": true
},
"createdAt": {
- "type": "string"
+ "type": "string",
+ "format": "date-time"
},
"size": {
"type": "number"
@@ -4434,7 +4468,8 @@
"nullable": true
},
"createdAt": {
- "type": "string"
+ "type": "string",
+ "format": "date-time"
},
"size": {
"type": "number"
@@ -4519,7 +4554,8 @@
"nullable": true
},
"createdAt": {
- "type": "string"
+ "type": "string",
+ "format": "date-time"
},
"size": {
"type": "number"
@@ -4644,7 +4680,10 @@
"description": "The backup file as a zip archive.",
"content": {
"application/zip": {
- "schema": {}
+ "schema": {
+ "type": "string",
+ "format": "binary"
+ }
}
}
},
diff --git a/packages/open-api/lib/admin.ts b/packages/open-api/lib/admin.ts
index fc0f65d0..354543a7 100644
--- a/packages/open-api/lib/admin.ts
+++ b/packages/open-api/lib/admin.ts
@@ -1,8 +1,5 @@
-import {
- extendZodWithOpenApi,
- OpenAPIRegistry,
-} from "@asteasolutions/zod-to-openapi";
-import { z } from "zod";
+import { OpenAPIRegistry } from "@asteasolutions/zod-to-openapi";
+import * as z from "zod";
import { updateUserSchema } from "@karakeep/shared/types/admin";
@@ -10,7 +7,6 @@ import { BearerAuth } from "./common";
import { ErrorSchema, UnauthorizedResponse } from "./errors";
export const registry = new OpenAPIRegistry();
-extendZodWithOpenApi(z);
const updateUserRequestSchema = updateUserSchema.omit({ userId: true });
diff --git a/packages/open-api/lib/assets.ts b/packages/open-api/lib/assets.ts
index d5af6f17..da24f928 100644
--- a/packages/open-api/lib/assets.ts
+++ b/packages/open-api/lib/assets.ts
@@ -1,14 +1,10 @@
-import {
- extendZodWithOpenApi,
- OpenAPIRegistry,
-} from "@asteasolutions/zod-to-openapi";
-import { z } from "zod";
+import { OpenAPIRegistry } from "@asteasolutions/zod-to-openapi";
+import * as z from "zod";
import { BearerAuth } from "./common";
import { UnauthorizedResponse } from "./errors";
export const registry = new OpenAPIRegistry();
-extendZodWithOpenApi(z);
export const AssetIdSchema = registry.registerParameter(
"AssetId",
@@ -37,7 +33,11 @@ registry.registerPath({
content: {
"multipart/form-data": {
schema: z.object({
- file: z.instanceof(File).openapi("File to be uploaded"),
+ file: z.instanceof(File).openapi({
+ description: "File to be uploaded",
+ type: "string",
+ format: "binary",
+ }),
}),
},
},
diff --git a/packages/open-api/lib/backups.ts b/packages/open-api/lib/backups.ts
index d9960902..93fe6f90 100644
--- a/packages/open-api/lib/backups.ts
+++ b/packages/open-api/lib/backups.ts
@@ -1,8 +1,5 @@
-import {
- extendZodWithOpenApi,
- OpenAPIRegistry,
-} from "@asteasolutions/zod-to-openapi";
-import { z } from "zod";
+import { OpenAPIRegistry } from "@asteasolutions/zod-to-openapi";
+import * as z from "zod";
import { zBackupSchema } from "@karakeep/shared/types/backups";
@@ -10,7 +7,6 @@ import { BearerAuth } from "./common";
import { ErrorSchema, UnauthorizedResponse } from "./errors";
export const registry = new OpenAPIRegistry();
-extendZodWithOpenApi(z);
export const BackupIdSchema = registry.registerParameter(
"BackupId",
@@ -121,7 +117,10 @@ registry.registerPath({
description: "The backup file as a zip archive.",
content: {
"application/zip": {
- schema: z.instanceof(Blob),
+ schema: z.any().openapi({
+ type: "string",
+ format: "binary",
+ }),
},
},
},
diff --git a/packages/open-api/lib/bookmarks.ts b/packages/open-api/lib/bookmarks.ts
index 04a3a1f3..336b4af2 100644
--- a/packages/open-api/lib/bookmarks.ts
+++ b/packages/open-api/lib/bookmarks.ts
@@ -1,8 +1,5 @@
-import {
- extendZodWithOpenApi,
- OpenAPIRegistry,
-} from "@asteasolutions/zod-to-openapi";
-import { z } from "zod";
+import { OpenAPIRegistry } from "@asteasolutions/zod-to-openapi";
+import * as z from "zod";
import {
zAssetSchema,
@@ -27,7 +24,6 @@ import { TagIdSchema } from "./tags";
import { HighlightSchema, ListSchema } from "./types";
export const registry = new OpenAPIRegistry();
-extendZodWithOpenApi(z);
export const BookmarkIdSchema = registry.registerParameter(
"BookmarkId",
@@ -62,11 +58,11 @@ registry.registerPath({
sortOrder: zSortOrder
.exclude(["relevance"])
.optional()
- .default(zSortOrder.Enum.desc)
+ .default(zSortOrder.enum.desc)
.describe("Sort order by creation date. Defaults to 'desc'."),
})
- .merge(PaginationSchema)
- .merge(IncludeContentSearchParamSchema),
+ .extend(PaginationSchema.shape)
+ .extend(IncludeContentSearchParamSchema.shape),
},
responses: {
200: {
@@ -97,13 +93,13 @@ registry.registerPath({
q: z.string().describe("The search query string."),
sortOrder: zSortOrder
.optional()
- .default(zSortOrder.Enum.relevance)
+ .default(zSortOrder.enum.relevance)
.describe(
"Sort order for results. Defaults to 'relevance'. Use 'asc' or 'desc' for date-based sorting.",
),
})
- .merge(PaginationSchema)
- .merge(IncludeContentSearchParamSchema),
+ .extend(PaginationSchema.shape)
+ .extend(IncludeContentSearchParamSchema.shape),
},
responses: {
200: {
diff --git a/packages/open-api/lib/errors.ts b/packages/open-api/lib/errors.ts
index 913e93b4..89445028 100644
--- a/packages/open-api/lib/errors.ts
+++ b/packages/open-api/lib/errors.ts
@@ -1,7 +1,4 @@
-import { extendZodWithOpenApi } from "@asteasolutions/zod-to-openapi";
-import { z } from "zod";
-
-extendZodWithOpenApi(z);
+import * as z from "zod";
export const ErrorSchema = z
.object({
diff --git a/packages/open-api/lib/feeds.ts b/packages/open-api/lib/feeds.ts
index 03026871..644eb4e5 100644
--- a/packages/open-api/lib/feeds.ts
+++ b/packages/open-api/lib/feeds.ts
@@ -1,8 +1,5 @@
-import {
- extendZodWithOpenApi,
- OpenAPIRegistry,
-} from "@asteasolutions/zod-to-openapi";
-import { z } from "zod";
+import { OpenAPIRegistry } from "@asteasolutions/zod-to-openapi";
+import * as z from "zod";
import {
zFeedSchema,
@@ -14,7 +11,6 @@ import { BearerAuth } from "./common";
import { ErrorSchema, UnauthorizedResponse } from "./errors";
export const registry = new OpenAPIRegistry();
-extendZodWithOpenApi(z);
const FeedSchema = zFeedSchema
.extend({
diff --git a/packages/open-api/lib/highlights.ts b/packages/open-api/lib/highlights.ts
index eb652df1..0ef8bab1 100644
--- a/packages/open-api/lib/highlights.ts
+++ b/packages/open-api/lib/highlights.ts
@@ -1,8 +1,5 @@
-import {
- extendZodWithOpenApi,
- OpenAPIRegistry,
-} from "@asteasolutions/zod-to-openapi";
-import { z } from "zod";
+import { OpenAPIRegistry } from "@asteasolutions/zod-to-openapi";
+import * as z from "zod";
import {
zNewHighlightSchema,
@@ -15,7 +12,6 @@ import { PaginationSchema } from "./pagination";
import { HighlightSchema, PaginatedHighlightsSchema } from "./types";
export const registry = new OpenAPIRegistry();
-extendZodWithOpenApi(z);
export const HighlightIdSchema = registry.registerParameter(
"HighlightId",
diff --git a/packages/open-api/lib/lists.ts b/packages/open-api/lib/lists.ts
index d525f406..b44fcc73 100644
--- a/packages/open-api/lib/lists.ts
+++ b/packages/open-api/lib/lists.ts
@@ -1,8 +1,5 @@
-import {
- extendZodWithOpenApi,
- OpenAPIRegistry,
-} from "@asteasolutions/zod-to-openapi";
-import { z } from "zod";
+import { OpenAPIRegistry } from "@asteasolutions/zod-to-openapi";
+import * as z from "zod";
import { zSortOrder } from "@karakeep/shared/types/bookmarks";
import {
@@ -21,7 +18,6 @@ import {
import { ListSchema } from "./types";
export const registry = new OpenAPIRegistry();
-extendZodWithOpenApi(z);
export const ListIdSchema = registry.registerParameter(
"ListId",
@@ -220,11 +216,11 @@ registry.registerPath({
sortOrder: zSortOrder
.exclude(["relevance"])
.optional()
- .default(zSortOrder.Enum.desc)
+ .default(zSortOrder.enum.desc)
.describe("Sort order by creation date. Defaults to 'desc'."),
})
- .merge(PaginationSchema)
- .merge(IncludeContentSearchParamSchema),
+ .extend(PaginationSchema.shape)
+ .extend(IncludeContentSearchParamSchema.shape),
},
responses: {
200: {
diff --git a/packages/open-api/lib/tags.ts b/packages/open-api/lib/tags.ts
index c8e728ee..fbdd9d8a 100644
--- a/packages/open-api/lib/tags.ts
+++ b/packages/open-api/lib/tags.ts
@@ -1,8 +1,5 @@
-import {
- extendZodWithOpenApi,
- OpenAPIRegistry,
-} from "@asteasolutions/zod-to-openapi";
-import { z } from "zod";
+import { OpenAPIRegistry } from "@asteasolutions/zod-to-openapi";
+import * as z from "zod";
import { zSortOrder } from "@karakeep/shared/types/bookmarks";
import {
@@ -22,7 +19,6 @@ import {
import { TagSchema } from "./types";
export const registry = new OpenAPIRegistry();
-extendZodWithOpenApi(z);
export const TagIdSchema = registry.registerParameter(
"TagId",
@@ -218,11 +214,11 @@ registry.registerPath({
sortOrder: zSortOrder
.exclude(["relevance"])
.optional()
- .default(zSortOrder.Enum.desc)
+ .default(zSortOrder.enum.desc)
.describe("Sort order by creation date. Defaults to 'desc'."),
})
- .merge(PaginationSchema)
- .merge(IncludeContentSearchParamSchema),
+ .extend(PaginationSchema.shape)
+ .extend(IncludeContentSearchParamSchema.shape),
},
responses: {
200: {
diff --git a/packages/open-api/lib/types.ts b/packages/open-api/lib/types.ts
index b26ca58c..737723fa 100644
--- a/packages/open-api/lib/types.ts
+++ b/packages/open-api/lib/types.ts
@@ -1,13 +1,10 @@
-import { extendZodWithOpenApi } from "@asteasolutions/zod-to-openapi";
-import { z } from "zod";
+import * as z from "zod";
import { zBookmarkSchema } from "@karakeep/shared/types/bookmarks";
import { zHighlightSchema } from "@karakeep/shared/types/highlights";
import { zBookmarkListSchema } from "@karakeep/shared/types/lists";
import { zGetTagResponseSchema } from "@karakeep/shared/types/tags";
-extendZodWithOpenApi(z);
-
export const ListSchema = zBookmarkListSchema.openapi("List");
export const BookmarkSchema = zBookmarkSchema.openapi("Bookmark");
diff --git a/packages/open-api/lib/users.ts b/packages/open-api/lib/users.ts
index 109c7a5a..ade5acfc 100644
--- a/packages/open-api/lib/users.ts
+++ b/packages/open-api/lib/users.ts
@@ -1,8 +1,4 @@
-import {
- extendZodWithOpenApi,
- OpenAPIRegistry,
-} from "@asteasolutions/zod-to-openapi";
-import { z } from "zod";
+import { OpenAPIRegistry } from "@asteasolutions/zod-to-openapi";
import {
zUserStatsResponseSchema,
@@ -13,7 +9,6 @@ import { BearerAuth } from "./common";
import { UnauthorizedResponse } from "./errors";
export const registry = new OpenAPIRegistry();
-extendZodWithOpenApi(z);
registry.registerPath({
operationId: "getCurrentUser",
diff --git a/packages/open-api/package.json b/packages/open-api/package.json
index 13afa214..70b3c7d3 100644
--- a/packages/open-api/package.json
+++ b/packages/open-api/package.json
@@ -5,9 +5,9 @@
"private": true,
"type": "module",
"dependencies": {
- "@asteasolutions/zod-to-openapi": "^7.2.0",
+ "@asteasolutions/zod-to-openapi": "^8.5.0",
"@karakeep/shared": "workspace:^0.1.0",
- "zod": "^3.24.4"
+ "zod": "^4.0.0"
},
"devDependencies": {
"@karakeep/tsconfig": "workspace:^0.1.0",
diff --git a/packages/open-api/zod-extend.ts b/packages/open-api/zod-extend.ts
new file mode 100644
index 00000000..2a8fe9a4
--- /dev/null
+++ b/packages/open-api/zod-extend.ts
@@ -0,0 +1,4 @@
+import { extendZodWithOpenApi } from "@asteasolutions/zod-to-openapi";
+import * as z from "zod";
+
+extendZodWithOpenApi(z);
diff --git a/packages/plugins/package.json b/packages/plugins/package.json
index a9623d0d..f7c90c40 100644
--- a/packages/plugins/package.json
+++ b/packages/plugins/package.json
@@ -24,7 +24,7 @@
"@restatedev/restate-sdk": "^1.10.3",
"@restatedev/restate-sdk-clients": "^1.10.3",
"async-mutex": "^0.4.1",
- "liteque": "^0.7.0",
+ "liteque": "^0.8.0",
"meilisearch": "^0.45.0",
"redis": "^5.11.0"
},
diff --git a/packages/plugins/queue-restate/src/env.ts b/packages/plugins/queue-restate/src/env.ts
index 41003460..e216967e 100644
--- a/packages/plugins/queue-restate/src/env.ts
+++ b/packages/plugins/queue-restate/src/env.ts
@@ -3,7 +3,7 @@ import { z } from "zod";
const stringBool = (defaultValue: string) =>
z
.string()
- .default(defaultValue)
+ .prefault(defaultValue)
.refine((s) => s === "true" || s === "false")
.transform((s) => s === "true");
diff --git a/packages/plugins/queue-restate/src/types.ts b/packages/plugins/queue-restate/src/types.ts
index e406a4d3..74e04d00 100644
--- a/packages/plugins/queue-restate/src/types.ts
+++ b/packages/plugins/queue-restate/src/types.ts
@@ -14,7 +14,7 @@ export type SerializedError = z.infer<typeof zSerializedError>;
/**
* Zod schema for job data passed from dispatcher to runner.
*/
-export function zRunnerJobData<T extends z.ZodTypeAny>(payloadSchema: T) {
+export function zRunnerJobData<T extends z.ZodType>(payloadSchema: T) {
return z.object({
id: z.string(),
data: payloadSchema,
@@ -60,7 +60,7 @@ export type RunnerResult<R> =
/**
* Zod schema for runner.onCompleted() request.
*/
-export function zOnCompletedRequest<T extends z.ZodTypeAny>(payloadSchema: T) {
+export function zOnCompletedRequest<T extends z.ZodType>(payloadSchema: T) {
return z.object({
job: zRunnerJobData(payloadSchema),
result: z.unknown(),
@@ -70,7 +70,7 @@ export function zOnCompletedRequest<T extends z.ZodTypeAny>(payloadSchema: T) {
/**
* Zod schema for runner.onError() request.
*/
-export function zOnErrorRequest<T extends z.ZodTypeAny>(payloadSchema: T) {
+export function zOnErrorRequest<T extends z.ZodType>(payloadSchema: T) {
return z.object({
job: zRunnerJobData(payloadSchema),
error: zSerializedError,
diff --git a/packages/shared/config.ts b/packages/shared/config.ts
index 55bfa3c9..fa175baf 100644
--- a/packages/shared/config.ts
+++ b/packages/shared/config.ts
@@ -5,7 +5,7 @@ import { z } from "zod";
const stringBool = (defaultValue: string) =>
z
.string()
- .default(defaultValue)
+ .prefault(defaultValue)
.refine((s) => s === "true" || s === "false")
.transform((s) => s === "true");
@@ -22,7 +22,7 @@ const allEnv = z.object({
WORKERS_PORT: z.coerce.number().default(0),
WORKERS_ENABLED_WORKERS: z
.string()
- .default("")
+ .prefault("")
.transform((val) =>
val
.split(",")
@@ -31,7 +31,7 @@ const allEnv = z.object({
),
WORKERS_DISABLED_WORKERS: z
.string()
- .default("")
+ .prefault("")
.transform((val) =>
val
.split(",")
@@ -42,7 +42,7 @@ const allEnv = z.object({
NEXTAUTH_URL: z
.string()
.url()
- .default("http://localhost:3000")
+ .prefault("http://localhost:3000")
.transform((s) => s.replace(/\/+$/, "")),
NEXTAUTH_SECRET: z.string().optional(),
DISABLE_SIGNUPS: stringBool("false"),
@@ -80,7 +80,7 @@ const allEnv = z.object({
OCR_CACHE_DIR: z.string().optional(),
OCR_LANGS: z
.string()
- .default("eng")
+ .prefault("eng")
.transform((val) => val.split(",")),
OCR_CONFIDENCE_THRESHOLD: z.coerce.number().default(50),
OCR_USE_LLM: stringBool("false"),
@@ -110,12 +110,12 @@ const allEnv = z.object({
CRAWLER_ENABLE_ADBLOCKER: stringBool("true"),
CRAWLER_YTDLP_ARGS: z
.string()
- .default("")
+ .prefault("")
.transform((t) => t.split("%%").filter((a) => a)),
CRAWLER_MONOLITH_TIMEOUT_SEC: z.coerce.number().default(5),
CRAWLER_MONOLITH_ARGS: z
.string()
- .default("")
+ .prefault("")
.transform((t) => t.split("%%").filter((a) => a)),
CRAWLER_PARSER_MEM_LIMIT_MB: z.coerce.number().default(512),
CRAWLER_PARSE_TIMEOUT_SEC: z.coerce.number().default(60),
diff --git a/packages/shared/inference.ts b/packages/shared/inference.ts
index 91d4bd59..9ef2f2c1 100644
--- a/packages/shared/inference.ts
+++ b/packages/shared/inference.ts
@@ -3,7 +3,6 @@ import OpenAI from "openai";
import { zodResponseFormat } from "openai/helpers/zod";
import * as undici from "undici";
import { z } from "zod";
-import { zodToJsonSchema } from "zod-to-json-schema";
import serverConfig from "./config";
import { customFetch } from "./customFetch";
@@ -282,8 +281,9 @@ class OllamaInferenceClient implements InferenceClient {
model: model,
format: mapInferenceOutputSchema(
{
+ // Use Zod 4's native JSON Schema emitter for Ollama structured output.
structured: optsWithDefaults.schema
- ? zodToJsonSchema(optsWithDefaults.schema)
+ ? z.toJSONSchema(optsWithDefaults.schema)
: undefined,
json: "json",
plain: undefined,
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 2dcc86d9..2bcef649 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -11,12 +11,11 @@
"js-tiktoken": "^1.0.20",
"nodemailer": "^7.0.4",
"ollama": "^0.5.14",
- "openai": "^5.23.2",
+ "openai": "^6.34.0",
"typescript-parsec": "^0.3.4",
"undici": "^6.23.0",
"winston": "^3.11.0",
- "zod": "^3.24.4",
- "zod-to-json-schema": "^3.24.3"
+ "zod": "^4.0.0"
},
"devDependencies": {
"@karakeep/tsconfig": "workspace:^0.1.0",
diff --git a/packages/shared/types/admin.ts b/packages/shared/types/admin.ts
index 02d7c341..d7f938b9 100644
--- a/packages/shared/types/admin.ts
+++ b/packages/shared/types/admin.ts
@@ -6,7 +6,9 @@ export const zRoleSchema = z.object({
role: z.enum(["user", "admin"]),
});
-export const zAdminCreateUserSchema = zSignUpSchema.and(zRoleSchema);
+export const zAdminCreateUserSchema = zSignUpSchema.safeExtend(
+ zRoleSchema.shape,
+);
export const updateUserSchema = z.object({
userId: z.string(),
diff --git a/packages/shared/types/bookmarks.ts b/packages/shared/types/bookmarks.ts
index 2f32bd51..00a7bc4b 100644
--- a/packages/shared/types/bookmarks.ts
+++ b/packages/shared/types/bookmarks.ts
@@ -116,79 +116,81 @@ export const zBareBookmarkSchema = z.object({
export type ZBareBookmark = z.infer<typeof zBareBookmarkSchema>;
-export const zBookmarkSchema = zBareBookmarkSchema.merge(
+export const zBookmarkSchema = zBareBookmarkSchema.extend(
z.object({
tags: z.array(zBookmarkTagSchema),
content: zBookmarkContentSchema,
assets: z.array(zAssetSchema),
- }),
+ }).shape,
);
export type ZBookmark = z.infer<typeof zBookmarkSchema>;
-const zBookmarkTypeLinkSchema = zBareBookmarkSchema.merge(
+const zBookmarkTypeLinkSchema = zBareBookmarkSchema.extend(
z.object({
tags: z.array(zBookmarkTagSchema),
content: zBookmarkedLinkSchema,
assets: z.array(zAssetSchema),
- }),
+ }).shape,
);
export type ZBookmarkTypeLink = z.infer<typeof zBookmarkTypeLinkSchema>;
-const zBookmarkTypeTextSchema = zBareBookmarkSchema.merge(
+const zBookmarkTypeTextSchema = zBareBookmarkSchema.extend(
z.object({
tags: z.array(zBookmarkTagSchema),
content: zBookmarkedTextSchema,
assets: z.array(zAssetSchema),
- }),
+ }).shape,
);
export type ZBookmarkTypeText = z.infer<typeof zBookmarkTypeTextSchema>;
-const zBookmarkTypeAssetSchema = zBareBookmarkSchema.merge(
+const zBookmarkTypeAssetSchema = zBareBookmarkSchema.extend(
z.object({
tags: z.array(zBookmarkTagSchema),
content: zBookmarkedAssetSchema,
assets: z.array(zAssetSchema),
- }),
+ }).shape,
);
export type ZBookmarkTypeAsset = z.infer<typeof zBookmarkTypeAssetSchema>;
// POST /v1/bookmarks
-export const zNewBookmarkRequestSchema = z
- .object({
+export const zNewBookmarkRequestSchema = z.intersection(
+ z.object({
title: z.string().max(MAX_BOOKMARK_TITLE_LENGTH).nullish(),
archived: z.boolean().optional(),
favourited: z.boolean().optional(),
note: z.string().optional(),
summary: z.string().optional(),
- createdAt: z.coerce.date().optional(),
+ createdAt: z.coerce
+ .date()
+ .optional()
+ .meta({ type: "string", format: "date-time" }),
// A mechanism to prioritize crawling of bookmarks depending on whether
// they were created by a user interaction or by a bulk import.
crawlPriority: z.enum(["low", "normal"]).optional(),
// Deprecated
importSessionId: z.string().optional(),
source: zBookmarkSourceSchema.optional(),
- })
- .and(
- z.discriminatedUnion("type", [
- z.object({
- type: z.literal(BookmarkTypes.LINK),
- url: z.string().url(),
- precrawledArchiveId: z.string().optional(),
- }),
- z.object({
- type: z.literal(BookmarkTypes.TEXT),
- text: z.string(),
- sourceUrl: z.string().optional(),
- }),
- z.object({
- type: z.literal(BookmarkTypes.ASSET),
- assetType: z.enum(["image", "pdf"]),
- assetId: z.string(),
- fileName: z.string().optional(),
- sourceUrl: z.string().optional(),
- }),
- ]),
- );
+ }),
+ z.discriminatedUnion("type", [
+ z.object({
+ type: z.literal(BookmarkTypes.LINK),
+ url: z.string().url(),
+ precrawledArchiveId: z.string().optional(),
+ }),
+ z.object({
+ type: z.literal(BookmarkTypes.TEXT),
+ text: z.string(),
+ sourceUrl: z.string().optional(),
+ }),
+ z.object({
+ type: z.literal(BookmarkTypes.ASSET),
+ assetType: z.enum(["image", "pdf"]),
+ assetId: z.string(),
+ fileName: z.string().optional(),
+ sourceUrl: z.string().optional(),
+ }),
+ ]),
+);
export type ZNewBookmarkRequest = z.infer<typeof zNewBookmarkRequestSchema>;
// GET /v1/bookmarks
@@ -228,7 +230,10 @@ export const zUpdateBookmarksRequestSchema = z.object({
summary: z.string().nullish(),
note: z.string().optional(),
title: z.string().max(MAX_BOOKMARK_TITLE_LENGTH).nullish(),
- createdAt: z.coerce.date().optional(),
+ createdAt: z.coerce
+ .date()
+ .optional()
+ .meta({ type: "string", format: "date-time" }),
// Link specific fields (optional)
url: z.string().url().optional(),
description: z.string().nullish(),
diff --git a/packages/shared/types/highlights.ts b/packages/shared/types/highlights.ts
index de1d3ec2..f1681492 100644
--- a/packages/shared/types/highlights.ts
+++ b/packages/shared/types/highlights.ts
@@ -17,12 +17,12 @@ const zHighlightBaseSchema = z.object({
note: z.string().nullable(),
});
-export const zHighlightSchema = zHighlightBaseSchema.merge(
+export const zHighlightSchema = zHighlightBaseSchema.extend(
z.object({
id: z.string(),
userId: z.string(),
createdAt: z.date(),
- }),
+ }).shape,
);
export type ZHighlight = z.infer<typeof zHighlightSchema>;
diff --git a/packages/shared/types/rules.ts b/packages/shared/types/rules.ts
index adf44823..40a43fc3 100644
--- a/packages/shared/types/rules.ts
+++ b/packages/shared/types/rules.ts
@@ -361,7 +361,7 @@ const ruleValidaitorFn = (
message: "You must specify at least one action",
path: ["actions"],
});
- return false;
+ return;
}
r.actions.every((a) => validateAction(a));
};
diff --git a/packages/trpc/index.ts b/packages/trpc/index.ts
index ab9604ef..5959f7cf 100644
--- a/packages/trpc/index.ts
+++ b/packages/trpc/index.ts
@@ -1,6 +1,6 @@
import { initTRPC, TRPCError } from "@trpc/server";
import superjson from "superjson";
-import { ZodError } from "zod";
+import { ZodError, z } from "zod";
import type { db } from "@karakeep/db";
import serverConfig from "@karakeep/shared/config";
@@ -60,7 +60,7 @@ const t = initTRPC.context<Context>().create({
...shape.data,
zodError:
error.code === "BAD_REQUEST" && error.cause instanceof ZodError
- ? error.cause.flatten()
+ ? z.flattenError(error.cause)
: null,
},
};
diff --git a/packages/trpc/package.json b/packages/trpc/package.json
index db780262..964b6509 100644
--- a/packages/trpc/package.json
+++ b/packages/trpc/package.json
@@ -25,7 +25,7 @@
"stripe": "^20.3.1",
"superjson": "^2.2.1",
"tiny-invariant": "^1.3.3",
- "zod": "^3.24.4"
+ "zod": "^4.0.0"
},
"devDependencies": {
"@karakeep/tsconfig": "workspace:^0.1.0",
diff --git a/packages/trpc/routers/publicBookmarks.ts b/packages/trpc/routers/publicBookmarks.ts
index be852b67..72bbb6d7 100644
--- a/packages/trpc/routers/publicBookmarks.ts
+++ b/packages/trpc/routers/publicBookmarks.ts
@@ -25,7 +25,7 @@ export const publicBookmarks = router({
description: true,
icon: true,
})
- .merge(z.object({ ownerName: z.string() })),
+ .extend({ ownerName: z.string() }),
)
.query(async ({ input, ctx }) => {
return await List.getPublicListMetadata(
@@ -51,7 +51,7 @@ export const publicBookmarks = router({
description: true,
icon: true,
})
- .merge(z.object({ numItems: z.number(), ownerName: z.string() })),
+ .extend({ numItems: z.number(), ownerName: z.string() }),
bookmarks: z.array(zPublicBookmarkSchema),
nextCursor: zCursorV2.nullable(),
}),
diff --git a/packages/trpc/routers/subscriptions.ts b/packages/trpc/routers/subscriptions.ts
index deb998db..c148dcfe 100644
--- a/packages/trpc/routers/subscriptions.ts
+++ b/packages/trpc/routers/subscriptions.ts
@@ -259,7 +259,7 @@ export const subscriptionsRouter = router({
.object({
billingPeriod: z.enum(["monthly", "yearly"]).default("monthly"),
})
- .default({}),
+ .prefault({}),
)
.mutation(async ({ ctx, input }) => {
const { stripe, priceId, yearlyPriceId } = requireStripeConfig();
diff --git a/packages/trpc/routers/users.ts b/packages/trpc/routers/users.ts
index c11a0ffd..b242ac6d 100644
--- a/packages/trpc/routers/users.ts
+++ b/packages/trpc/routers/users.ts
@@ -32,7 +32,7 @@ export const usersAppRouter = router({
maxRequests: 3,
}),
)
- .input(zSignUpSchema.and(z.object({ redirectUrl: z.string().optional() })))
+ .input(zSignUpSchema.safeExtend({ redirectUrl: z.string().optional() }))
.output(
z.object({
id: z.string(),
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 39de1bdf..a9235329 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -111,8 +111,8 @@ importers:
specifier: ^1.0.7
version: 1.0.7([email protected])
zod:
- specifier: ^3.24.4
- version: 3.25.76
+ specifier: ^4.0.0
+ version: 4.3.6
devDependencies:
'@crxjs/vite-plugin':
specifier: 2.2.0
@@ -269,14 +269,14 @@ importers:
specifier: workspace:*
version: link:../../packages/sdk
'@modelcontextprotocol/sdk':
- specifier: ^1.9.0
- version: 1.12.1
+ specifier: ^1.29.0
+ version: 1.29.0([email protected])
turndown:
specifier: ^7.2.0
version: 7.2.0
zod:
- specifier: ^3.24.4
- version: 3.25.76
+ specifier: ^4.0.0
+ version: 4.3.6
devDependencies:
'@karakeep/tsconfig':
specifier: workspace:^0.1.0
@@ -471,8 +471,8 @@ importers:
specifier: ^2.2.1
version: 2.2.1
zod:
- specifier: ^3.24.4
- version: 3.25.76
+ specifier: ^4.0.0
+ version: 4.3.6
zustand:
specifier: ^5.0.5
@@ -748,8 +748,8 @@ importers:
specifier: ^2.2.1
version: 2.2.1
zod:
- specifier: ^3.24.4
- version: 3.25.76
+ specifier: ^4.0.0
+ version: 4.3.6
zustand:
specifier: ^5.0.5
@@ -866,8 +866,8 @@ importers:
specifier: ^24.0.0
version: 24.1.3
liteque:
- specifier: ^0.7.0
+ specifier: ^0.8.0
lru-cache:
specifier: ^11.2.2
version: 11.2.2
@@ -953,8 +953,8 @@ importers:
specifier: ^5.9
version: 5.9.3
zod:
- specifier: ^3.24.4
- version: 3.25.76
+ specifier: ^4.0.0
+ version: 4.3.6
devDependencies:
'@types/archiver':
specifier: ^7.0.0
@@ -1036,8 +1036,8 @@ importers:
specifier: ^0.4.2
'@hono/zod-validator':
- specifier: ^0.5.0
+ specifier: ^0.7.6
'@karakeep/db':
specifier: workspace:*
version: link:../db
@@ -1069,8 +1069,8 @@ importers:
specifier: ^1.2.2
version: 1.2.2
zod:
- specifier: ^3.24.4
- version: 3.25.76
+ specifier: ^4.0.0
+ version: 4.3.6
devDependencies:
'@karakeep/tsconfig':
specifier: workspace:^0.1.0
@@ -1112,8 +1112,8 @@ importers:
specifier: ^6.0.0
version: 6.0.0
zod:
- specifier: ^3.24.4
- version: 3.25.76
+ specifier: ^4.0.0
+ version: 4.3.6
devDependencies:
'@karakeep/tsconfig':
specifier: workspace:^0.1.0
@@ -1186,8 +1186,8 @@ importers:
specifier: ^2.2.1
version: 2.2.1
zod:
- specifier: ^3.24.4
- version: 3.25.76
+ specifier: ^4.0.0
+ version: 4.3.6
devDependencies:
'@karakeep/tsconfig':
specifier: workspace:^0.1.0
@@ -1208,14 +1208,14 @@ importers:
packages/open-api:
dependencies:
'@asteasolutions/zod-to-openapi':
- specifier: ^7.2.0
- version: 7.3.3([email protected])
+ specifier: ^8.5.0
+ version: 8.5.0([email protected])
'@karakeep/shared':
specifier: workspace:^0.1.0
version: link:../shared
zod:
- specifier: ^3.24.4
- version: 3.25.76
+ specifier: ^4.0.0
+ version: 4.3.6
devDependencies:
'@karakeep/tsconfig':
specifier: workspace:^0.1.0
@@ -1239,8 +1239,8 @@ importers:
specifier: ^0.4.1
version: 0.4.1
liteque:
- specifier: ^0.7.0
+ specifier: ^0.8.0
meilisearch:
specifier: ^0.45.0
version: 0.45.0
@@ -1304,8 +1304,8 @@ importers:
specifier: ^0.5.14
version: 0.5.17
openai:
- specifier: ^5.23.2
+ specifier: ^6.34.0
typescript-parsec:
specifier: ^0.3.4
version: 0.3.4
@@ -1316,11 +1316,8 @@ importers:
specifier: ^3.11.0
version: 3.17.0
zod:
- specifier: ^3.24.4
- version: 3.25.76
- zod-to-json-schema:
- specifier: ^3.24.3
- version: 3.24.5([email protected])
+ specifier: ^4.0.0
+ version: 4.3.6
devDependencies:
'@karakeep/tsconfig':
specifier: workspace:^0.1.0
@@ -1463,8 +1460,8 @@ importers:
specifier: ^1.3.3
version: 1.3.3
zod:
- specifier: ^3.24.4
- version: 3.25.76
+ specifier: ^4.0.0
+ version: 4.3.6
devDependencies:
'@karakeep/tsconfig':
specifier: workspace:^0.1.0
@@ -1548,8 +1545,8 @@ importers:
specifier: ^5.3.0
version: 5.4.1
zod:
- specifier: ^3.24.4
- version: 3.25.76
+ specifier: ^4.0.0
+ version: 4.3.6
devDependencies:
'@types/node':
specifier: ^24
@@ -1679,10 +1676,10 @@ packages:
'@asamuzakjp/[email protected]':
resolution: {integrity: sha512-n8GuYSrI9bF7FFZ/SjhwevlHc8xaVlb/7HmHelnc/PZXBD2ZR49NnN9sMMuDdEGPeeRQ5d0hqlSlEpgCX3Wl0Q==}
- '@asteasolutions/[email protected]':
- resolution: {integrity: sha512-ioiw+R+gBGAUwmDp+/gJA16tedBivzDaji5wOvWej0ZYDE0CXTSSfJfXbrBIuWKh6JQhuXgNDniJdeDueKUZTA==}
+ '@asteasolutions/[email protected]':
+ resolution: {integrity: sha512-SABbKiObg5dLRiTFnqiW1WWwGcg1BJfmHtT2asIBnBHg6Smy/Ms2KHc650+JI4Hw7lSkdiNebEGXpwoxfben8Q==}
peerDependencies:
- zod: ^3.20.2
+ zod: ^4.0.0
'@astrojs/[email protected]':
resolution: {integrity: sha512-LDng8446QLS5ToKjRHd3bgUdirvemVVExV7nRyJfW2wV36xuv7vDxwy5NWN9zqeSEDgg0Tv84sP+T3yEq+Zlkw==}
@@ -4017,11 +4014,11 @@ packages:
'@trpc/server': ^10.10.0 || >11.0.0-rc
hono: '>=4.0.0'
- resolution: {integrity: sha512-ds5bW6DCgAnNHP33E3ieSbaZFd5dkV52ZjyaXtGoR06APFrCtzAsKZxTHwOrJNBdXsi0e5wNwo5L4nVEVnJUdg==}
+ resolution: {integrity: sha512-Io1B6d011Gj1KknV4rXYz4le5+5EubcWEU/speUjuw9XMMIaP3n78yXLhjd2A3PXaXaUwEAluOiAyLqhBEJgsw==}
peerDependencies:
hono: '>=3.9.0'
- zod: ^3.19.1
+ zod: ^3.25.0 || ^4.0.0
'@hookform/[email protected]':
resolution: {integrity: sha512-U410sAr92xgxT1idlu9WWOVjndxLdgPUHEB8Schr27C9eh7/xUnITWpCMF93s+lGiG++D4JnbSnrb5A21AdSNg==}
@@ -4497,9 +4494,15 @@ packages:
'@mixmark-io/[email protected]':
resolution: {integrity: sha512-Y28PR25bHXUg88kCV7nivXrP2Nj2RueZ3/l/jdx6J9f8J4nsEGcgX0Qe6lt7Pa+J79+kPiJU3LguR6O/6zrLOw==}
- '@modelcontextprotocol/[email protected]':
- resolution: {integrity: sha512-KG1CZhZfWg+u8pxeM/mByJDScJSrjjxLc8fwQqbsS8xCjBmQfMNEBTotYdNanKekepnfRI85GtgQlctLFpcYPw==}
+ '@modelcontextprotocol/[email protected]':
+ resolution: {integrity: sha512-zo37mZA9hJWpULgkRpowewez1y6ML5GsXJPY8FI0tBBCd77HEvza4jDqRKOXgHNn867PVGCyTdzqpz0izu5ZjQ==}
engines: {node: '>=18'}
+ peerDependencies:
+ '@cfworker/json-schema': ^4.1.1
+ zod: ^3.25 || ^4.0
+ peerDependenciesMeta:
+ '@cfworker/json-schema':
+ optional: true
'@mozilla/[email protected]':
resolution: {integrity: sha512-juG5VWh4qAivzTAeMzvY9xs9HY5rAcr2E4I7tiSSCokRFi7XIZCAu92ZkSTsIj1OPceCifL3cpfteP3pDT9/QQ==}
@@ -7955,8 +7958,8 @@ packages:
resolution: {integrity: sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==}
engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
- resolution: {integrity: sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==}
+ resolution: {integrity: sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA==}
engines: {node: '>=18'}
@@ -9798,18 +9801,18 @@ packages:
resolution: {integrity: sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA==}
- resolution: {integrity: sha512-eB5zbQh5h+VenMPM3fh+nw1YExi5nMr6HUCR62ELSP11huvxm/Uir1H1QEyTkk5QX6A58pX6NmaTMceKZ0Eodg==}
+ resolution: {integrity: sha512-77VmFeJkO0/rvimEDuUC5H30oqUC4EyOhyGccfqoLebB0oiEYfM7nwPrsDsBL1gsTpwfzX8SFy2MT3TDyRq+bg==}
engines: {node: '>= 16'}
peerDependencies:
- express: ^4.11 || 5 || ^5.0.0-beta.1
+ express: '>= 4.11'
resolution: {integrity: sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==}
engines: {node: '>= 0.10.0'}
- resolution: {integrity: sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==}
+ resolution: {integrity: sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==}
engines: {node: '>= 18'}
@@ -10233,7 +10236,7 @@ packages:
resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
- deprecated: Glob versions prior to v9 are no longer supported
+ deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting [email protected]
resolution: {integrity: sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg==}
@@ -10543,6 +10546,10 @@ packages:
resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==}
engines: {node: '>= 0.8'}
+ resolution: {integrity: sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==}
+ engines: {node: '>= 0.8'}
+
resolution: {integrity: sha512-Pysuw9XpUq5dVc/2SMHpuTY01RFl8fttgcyunjL7eEMhGM3cI4eOmiCycJDVCo/7O7ClfQD3SaI6ftDzqOXYMA==}
@@ -10726,6 +10733,10 @@ packages:
resolution: {integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==}
+ resolution: {integrity: sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==}
+ engines: {node: '>= 12'}
+
resolution: {integrity: sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==}
engines: {node: '>= 12'}
@@ -11156,6 +11167,9 @@ packages:
resolution: {integrity: sha512-s+3Al/p9g32Iq+oqXxkW//7jk2Vig6FF1CFqzVXoTUXt2qz89YWbL+OwS17NFYEvxC35n0FKeGO2LGYSxeM2Gg==}
+ resolution: {integrity: sha512-d7kPDd34KO/YnzaDOlikGpOurfF0ByC2sEV4cANCtdqLlTfBlw2p14O/5d/zv40gJPbIQxfES3nSx1/oYNyuZQ==}
+
resolution: {integrity: sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==}
engines: {node: '>=0.10.0'}
@@ -11244,6 +11258,9 @@ packages:
resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
+ resolution: {integrity: sha512-fQhoXdcvc3V28x7C7BMs4P5+kNlgUURe2jmUT1T//oBRMDrqy1QPelJimwZGo7Hg9VPV3EQV5Bnq4hbFy2vetA==}
+
resolution: {integrity: sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==}
@@ -11492,8 +11509,8 @@ packages:
resolution: {integrity: sha512-wUayTU8MS827Dam6MxgD72Ui+KOSF+u/eIqpatOtjnvgJ0+mnDq33uC2M7J0tPK+upe/DpUAuK4JUU89iBoNKQ==}
engines: {node: '>=4'}
- resolution: {integrity: sha512-3eov7hUb+fsQgX2E1Xl1/egxdjnA8opSh+xmB8iIpJthcHYPvFdyI4UIB7JzXnYbMjiNCKDELrk+AjqGLlvp1Q==}
+ resolution: {integrity: sha512-MvcdfjCsds5s3tR/0k5Ou+ZhLBnTY6dYfxoy6yyao2evToQEX7n62KWrCBJ2Pa4Nnvh11S2IrP4RlM7wdUFFpw==}
peerDependencies:
better-sqlite3: '>=7'
@@ -12764,12 +12781,12 @@ packages:
resolution: {integrity: sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==}
engines: {node: '>=12'}
- resolution: {integrity: sha512-MQBzmTulj+MM5O8SKEk/gL8a7s5mktS9zUtAkU257WjvobGc9nKcBuVwjyEEcb9SI8a8Y2G/mzn3vm9n1Jlleg==}
+ resolution: {integrity: sha512-yEr2jdGf4tVFYG6ohmr3pF6VJuveP0EA/sS8TBx+4Eq5NT10alu5zg2dmxMXMgqpihRDQlFGpRt2XwsGj+Fyxw==}
hasBin: true
peerDependencies:
ws: ^8.18.0
- zod: ^3.23.8
+ zod: ^3.25 || ^4.0
peerDependenciesMeta:
ws:
optional: true
@@ -13886,6 +13903,10 @@ packages:
resolution: {integrity: sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==}
engines: {node: '>=0.6'}
+ resolution: {integrity: sha512-6YHEFRL9mfgcAvql/XhwTvf5jKcOiiupt2FiJxHkiX1z4j7WL8J/jRHYLluORvc1XxB5rV20KoeK00gVJamspg==}
+ engines: {node: '>=0.6'}
+
resolution: {integrity: sha512-t41VRkMYbkHyCYmOvx/6URnN80H7k4X0lLdBMGsz+maAwrJQYB1djpV6vHrQIBE0WBSGqhtEHrK9U3DWWH8v7A==}
@@ -13928,6 +13949,10 @@ packages:
resolution: {integrity: sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==}
engines: {node: '>= 0.8'}
+ resolution: {integrity: sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==}
+ engines: {node: '>= 0.10'}
+
resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
hasBin: true
@@ -15257,6 +15282,10 @@ packages:
resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
engines: {node: '>= 0.8'}
+ resolution: {integrity: sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==}
+ engines: {node: '>= 0.8'}
+
resolution: {integrity: sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw==}
@@ -16965,13 +16994,10 @@ packages:
resolution: {integrity: sha512-+J9RrgTKOmlxFSDHo0pI1xM6BLVUv+o0ZT9ANtCxGkjIVCCUdx9alUF8Gm+dGLKbkkkidWIHFDZHDMpfITt4+w==}
- resolution: {integrity: sha512-/AuWwMP+YqiPbsJx5D6TfgRTc4kTLjsh5SOcd4bLsfUg2RcEXrFMJl1DGgdHy2aCfsIA/cr/1JM0xcB2GZji8g==}
+ resolution: {integrity: sha512-O/PgfnpT1xKSDeQYSCfRI5Gy3hPf91mKVDuYLUHZJMiDFptvP41MSnWofm8dnCm0256ZNfZIM7DSzuSMAFnjHA==}
peerDependencies:
- zod: ^3.24.1
-
- resolution: {integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==}
+ zod: ^3.25.28 || ^4
resolution: {integrity: sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==}
@@ -17156,10 +17182,10 @@ snapshots:
'@asamuzakjp/[email protected]': {}
dependencies:
openapi3-ts: 4.4.0
- zod: 3.25.76
+ zod: 4.3.6
dependencies:
@@ -21005,10 +21031,10 @@ snapshots:
'@trpc/server': 11.9.0([email protected])
hono: 4.12.8
dependencies:
hono: 4.12.8
- zod: 3.25.76
+ zod: 4.3.6
dependencies:
@@ -21630,19 +21656,25 @@ snapshots:
'@mixmark-io/[email protected]': {}
- '@modelcontextprotocol/[email protected]':
+ '@modelcontextprotocol/[email protected]([email protected])':
dependencies:
- ajv: 6.12.6
+ '@hono/node-server': 1.19.11([email protected])
+ ajv: 8.18.0
+ ajv-formats: 3.0.1([email protected])
content-type: 1.0.5
cors: 2.8.5
cross-spawn: 7.0.6
eventsource: 3.0.7
- express: 5.1.0
- express-rate-limit: 7.5.0([email protected])
+ eventsource-parser: 3.0.2
+ express: 5.2.1
+ express-rate-limit: 8.3.2([email protected])
+ hono: 4.12.8
+ jose: 6.2.2
+ json-schema-typed: 8.0.2
pkce-challenge: 5.0.0
raw-body: 3.0.0
- zod: 3.25.76
- zod-to-json-schema: 3.24.5([email protected])
+ zod: 4.3.6
+ zod-to-json-schema: 3.25.2([email protected])
transitivePeerDependencies:
- supports-color
@@ -24774,6 +24806,10 @@ snapshots:
optionalDependencies:
ajv: 8.13.0
+ optionalDependencies:
+ ajv: 8.18.0
+
dependencies:
ajv: 6.12.6
@@ -25380,16 +25416,16 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
bytes: 3.1.2
content-type: 1.0.5
debug: 4.4.3
http-errors: 2.0.0
- iconv-lite: 0.6.3
+ iconv-lite: 0.7.2
on-finished: 2.4.1
- qs: 6.14.0
- raw-body: 3.0.0
+ qs: 6.15.1
+ raw-body: 3.0.2
type-is: 2.0.1
transitivePeerDependencies:
- supports-color
@@ -27347,9 +27383,10 @@ snapshots:
dependencies:
- express: 5.1.0
+ express: 5.2.1
+ ip-address: 10.1.0
dependencies:
@@ -27387,15 +27424,16 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
accepts: 2.0.0
- body-parser: 2.2.0
+ body-parser: 2.2.2
content-disposition: 1.0.0
content-type: 1.0.5
cookie: 0.7.2
cookie-signature: 1.2.2
debug: 4.4.3
+ depd: 2.0.0
encodeurl: 2.0.0
escape-html: 1.0.3
etag: 1.8.1
@@ -28371,6 +28409,14 @@ snapshots:
statuses: 2.0.1
toidentifier: 1.0.1
+ dependencies:
+ depd: 2.0.0
+ inherits: 2.0.4
+ setprototypeof: 1.2.0
+ statuses: 2.0.2
+ toidentifier: 1.0.1
+
@@ -28450,7 +28496,6 @@ snapshots:
dependencies:
safer-buffer: 2.1.2
- optional: true
dependencies:
@@ -28531,6 +28576,8 @@ snapshots:
dependencies:
loose-envify: 1.4.0
+
dependencies:
jsbn: 1.1.0
@@ -28940,6 +28987,8 @@ snapshots:
+
@@ -29053,6 +29102,8 @@ snapshots:
+
@@ -29240,12 +29291,12 @@ snapshots:
dependencies:
async-mutex: 0.4.1
better-sqlite3: 11.3.0
- zod: 3.25.76
+ zod: 4.3.6
transitivePeerDependencies:
- '@aws-sdk/client-rds-data'
- '@cloudflare/workers-types'
@@ -31338,10 +31389,10 @@ snapshots:
is-docker: 2.2.1
is-wsl: 2.2.0
optionalDependencies:
ws: 8.18.3
- zod: 3.25.76
+ zod: 4.3.6
dependencies:
@@ -31383,7 +31434,7 @@ snapshots:
dependencies:
- yaml: 2.8.0
+ yaml: 2.8.3
@@ -32489,6 +32540,10 @@ snapshots:
dependencies:
side-channel: 1.1.0
+ dependencies:
+ side-channel: 1.1.0
+
@@ -32532,6 +32587,13 @@ snapshots:
iconv-lite: 0.6.3
unpipe: 1.0.0
+ dependencies:
+ bytes: 3.1.2
+ http-errors: 2.0.1
+ iconv-lite: 0.7.2
+ unpipe: 1.0.0
+
dependencies:
deep-extend: 0.6.0
@@ -34407,6 +34469,8 @@ snapshots:
+
@@ -36388,11 +36452,9 @@ snapshots:
dependencies:
- zod: 3.25.76
-
+ zod: 4.3.6
diff --git a/tools/compare-models/package.json b/tools/compare-models/package.json
index 5463742f..1d83abcc 100644
--- a/tools/compare-models/package.json
+++ b/tools/compare-models/package.json
@@ -14,7 +14,7 @@
"@karakeep/sdk": "workspace:^",
"@karakeep/shared": "workspace:^",
"chalk": "^5.3.0",
- "zod": "^3.24.4"
+ "zod": "^4.0.0"
},
"devDependencies": {
"@types/node": "^24",
diff --git a/tools/compare-models/src/config.ts b/tools/compare-models/src/config.ts
index 3a2d0d41..9c8bbbf9 100644
--- a/tools/compare-models/src/config.ts
+++ b/tools/compare-models/src/config.ts
@@ -28,7 +28,7 @@ const envSchema = z.object({
.string()
.optional()
.transform((val) => val === "true")
- .default("false"),
+ .prefault("false"),
});
export const config = envSchema.parse(process.env);