nuxt
diff --git a/Collapse file
‎src/utils/context.ts‎
Copy file name to clipboard
+52-36Lines changed: 52 additions & 36 deletions b/Collapse file
‎src/utils/context.ts‎
Copy file name to clipboard
+52-36Lines changed: 52 additions & 36 deletions
diff --git a/Collapse file
‎src/utils/dependencies.ts‎
Copy file name to clipboardExpand all lines: src/utils/dependencies.ts
+6-1Lines changed: 6 additions & 1 deletion b/Collapse file
‎src/utils/dependencies.ts‎
Copy file name to clipboardExpand all lines: src/utils/dependencies.ts
+6-1Lines changed: 6 additions & 1 deletion
diff --git a/Collapse file
‎test/unit/validatorRegistry.test.ts‎
Copy file name to clipboard
+33Lines changed: 33 additions & 0 deletions b/Collapse file
‎test/unit/validatorRegistry.test.ts‎
Copy file name to clipboard
+33Lines changed: 33 additions & 0 deletions
@@ -1,46 +1,62 @@
-import { createContext } from 'unctx'
+import { getContext } from 'unctx'
+import type { Draft07 } from '../types'
 
 type ContextKey = 'zod3' | 'zod4' | 'valibot' | 'unknown'
 
-const nuxtContentContext = {
-  zod3: {
-    toJSONSchema: (_schema: unknown, _name: string) => {
-      throw new Error(
-        'It seems you are using Zod version 3 for collection schema, but Zod is not installed, '
-        + 'Nuxt Content does not ship with zod, install `zod` and `zod-to-json-schema` and it will work.',
-      )
+type SchemaHandler = { toJSONSchema: (schema: unknown, name: string) => Draft07 }
+
+type NuxtContentContext = {
+  zod3: SchemaHandler
+  zod4: SchemaHandler
+  valibot: SchemaHandler
+  unknown: SchemaHandler
+  set: (key: ContextKey, value: unknown) => void
+  get: (key: ContextKey) => SchemaHandler
+}
+
+const ctx = getContext<NuxtContentContext>('@nuxt/content:validators-context')
+
+/**
+ * Initialize the context if it hasn't been set yet.
+ */
+if (!ctx.tryUse()) {
+  ctx.set({
+    zod3: {
+      toJSONSchema: (_schema: unknown, _name: string) => {
+        throw new Error(
+          'It seems you are using Zod version 3 for collection schema, but Zod is not installed, '
+          + 'Nuxt Content does not ship with zod, install `zod` and `zod-to-json-schema` and it will work.',
+        )
+      },
     },
-  },
-  zod4: {
-    toJSONSchema: (_schema: unknown, _name: string) => {
-      throw new Error(
-        'It seems you are using Zod version 4 for collection schema, but Zod is not installed, '
-        + 'Nuxt Content does not ship with zod, install `zod` and it will work.',
-      )
+    zod4: {
+      toJSONSchema: (_schema: unknown, _name: string) => {
+        throw new Error(
+          'It seems you are using Zod version 4 for collection schema, but Zod is not installed, '
+          + 'Nuxt Content does not ship with zod, install `zod` and it will work.',
+        )
+      },
     },
-  },
-  valibot: {
-    toJSONSchema: (_schema: unknown, _name: string) => {
-      throw new Error(
-        'It seems you are using Valibot for collection schema, but Valibot is not installed, '
-        + 'Nuxt Content does not ship with valibot, install `valibot` and `@valibot/to-json-schema` and it will work.',
-      )
+    valibot: {
+      toJSONSchema: (_schema: unknown, _name: string) => {
+        throw new Error(
+          'It seems you are using Valibot for collection schema, but Valibot is not installed, '
+          + 'Nuxt Content does not ship with valibot, install `valibot` and `@valibot/to-json-schema` and it will work.',
+        )
+      },
     },
-  },
-  unknown: {
-    toJSONSchema: (_schema: unknown, _name: string) => {
-      throw new Error('Unknown schema vendor')
+    unknown: {
+      toJSONSchema: (_schema: unknown, _name: string) => {
+        throw new Error('Unknown schema vendor')
+      },
     },
-  },
-  set: (key: ContextKey, value: unknown) => {
-    nuxtContentContext[key] = value as typeof nuxtContentContext[ContextKey]
-  },
-  get: (key: ContextKey) => {
-    return nuxtContentContext[key]
-  },
+    set(key: ContextKey, value: unknown) {
+      (this as unknown as Record<ContextKey, unknown>)[key] = value
+    },
+    get(key: ContextKey) {
+      return (this as unknown as Record<ContextKey, SchemaHandler>)[key]
+    },
+  })
 }
 
-const ctx = createContext<typeof nuxtContentContext>()
-ctx.set(nuxtContentContext)
-
 export default ctx.use
@@ -1,11 +1,16 @@
 import { addDependency } from 'nypm'
+import { resolvePackageJSON } from 'pkg-types'
 import { logger } from './dev'
 import nuxtContentContext from './context'
 import { tryUseNuxt } from '@nuxt/kit'
 
 export async function isPackageInstalled(packageName: string) {
+  // Resolve relative to @nuxt/content's own location so the check survives
+  // pnpm's `enableGlobalVirtualStore`, where dependencies declared by
+  // @nuxt/content (e.g. zod) aren't reachable from the user's project root
+  // and a plain dynamic import would fail.
   try {
-    await import(packageName)
+    await resolvePackageJSON(packageName, { from: import.meta.url })
     return true
   }
   catch {
 
@@ -0,0 +1,33 @@
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
+import { z } from 'zod'
+
+const SINGLETON_KEY = Symbol.for('@nuxt/content:validators-context')
+
+function resetValidatorsContext() {
+  Reflect.deleteProperty(globalThis as Record<symbol, unknown>, SINGLETON_KEY)
+}
+
+describe('validator registry', () => {
+  beforeEach(() => {
+    vi.resetModules()
+    resetValidatorsContext()
+  })
+
+  afterEach(() => {
+    resetValidatorsContext()
+  })
+
+  test('preserves initialized validators across duplicate module evaluations', async () => {
+    const { initiateValidatorsContext } = await import('../../src/utils/dependencies.ts?deps=primary')
+    await initiateValidatorsContext()
+
+    const { default: useContextA } = await import('../../src/utils/context.ts?ctx=a')
+    const { default: useContextB } = await import('../../src/utils/context.ts?ctx=b')
+
+    const contextA = useContextA()
+    const contextB = useContextB()
+
+    expect(contextA).toBe(contextB)
+    expect(() => contextB.get('zod3').toJSONSchema(z.object({ title: z.string() }), '__SCHEMA__')).not.toThrow()
+  })
+})