@vexcms/core 0.0.1 → 0.0.3

package/README.md

@@ -0,0 +1,155 @@
+# @vexcms/core
+
+The foundational package for [VEX CMS](https://github.com/vexcms) — a headless content management system built for [Convex](https://convex.dev).
+
+`@vexcms/core` provides the configuration API, field type system, schema generation, type generation, and all core utilities that power the VEX CMS ecosystem. It has no direct Convex dependency — Convex is a peer dependency only.
+
+## Installation
+
+```bash
+pnpm add @vexcms/core
+```
+
+## Features
+
+### Configuration API
+
+Define your CMS structure with a type-safe, declarative API:
+
+```typescript
+import { defineConfig, defineCollection, text, richtext, select } from "@vexcms/core"
+
+const posts = defineCollection({
+  slug: "posts",
+  labels: { singular: "Post", plural: "Posts" },
+  fields: {
+    title: text({ label: "Title", required: true }),
+    content: richtext({ label: "Content" }),
+    status: select({
+      label: "Status",
+      options: [
+        { label: "Draft", value: "draft" },
+        { label: "Published", value: "published" },
+      ],
+      defaultValue: "draft",
+    }),
+  },
+})
+
+export default defineConfig({
+  collections: [posts],
+  admin: { user: "user" },
+  basePath: "/admin",
+})
+```
+
+### Field Types
+
+13 built-in field types with full TypeScript inference:
+
+| Field | Description |
+|-------|-------------|
+| `text` | String with optional min/max length |
+| `number` | Numeric with optional min/max/step |
+| `checkbox` | Boolean toggle |
+| `select` | Single or multi-value enum with options |
+| `date` | Date stored as epoch milliseconds |
+| `imageUrl` | URL string for images |
+| `relationship` | Reference to another collection (single or hasMany) |
+| `upload` | Reference to media collection documents (single or hasMany) |
+| `json` | Arbitrary JSON data |
+| `array` | Wraps any field type in an array |
+| `richtext` | Plate/Slate JSON editor documents |
+| `ui` | Non-persisted custom render components |
+| `blocks` | Ordered array of block instances (discriminated union) |
+
+### Blocks System
+
+Define reusable content blocks for flexible page building:
+
+```typescript
+import { defineBlock, text, richtext } from "@vexcms/core"
+
+const heroBlock = defineBlock({
+  slug: "hero",
+  label: "Hero Section",
+  fields: {
+    heading: text({ label: "Heading", required: true }),
+    body: richtext({ label: "Body" }),
+  },
+})
+```
+
+### Collections, Globals & Media
+
+- **Collections** — Content types with typed fields, versioning/draft workflow, database indexes, search indexes, and admin UI configuration
+- **Globals** — Singleton settings (site config, navigation, etc.) with the same field system
+- **Media Collections** — File storage with auto-injected fields (storageId, filename, mimeType, size, url, alt, width, height)
+
+### Schema & Type Generation
+
+Generates Convex schema and TypeScript types from your config:
+
+```typescript
+import { generateVexSchema, generateVexTypes } from "@vexcms/core"
+
+const schemaSource = generateVexSchema(config)  // → vex.schema.ts
+const typesSource = generateVexTypes(config)     // → vex.types.ts
+```
+
+### Versioning & Drafts
+
+Per-collection draft/publish workflow with autosave:
+
+```typescript
+defineCollection({
+  slug: "posts",
+  versions: {
+    drafts: true,
+    autosave: { interval: 2000 },
+    maxPerDoc: 100,
+  },
+  // ...
+})
+```
+
+### Access Control (RBAC)
+
+Field-level and collection-level permissions:
+
+```typescript
+import { defineAccess } from "@vexcms/core"
+
+const access = defineAccess({
+  posts: {
+    read: true,
+    update: { mode: "allow", fields: ["title", "content"] },
+    delete: false,
+  },
+})
+```
+
+### Auto-Migration
+
+Schema diffing and migration planning for safe schema changes:
+
+```typescript
+import { diffSchema, planMigration } from "@vexcms/core"
+
+const diff = diffSchema(oldSchema, newSchema)
+const ops = planMigration(config, oldSchema, newSchema)
+```
+
+### Live Preview
+
+Per-collection iframe preview with responsive breakpoints and snapshot system.
+
+### Convex Integration Utilities
+
+Generic document CRUD operations, query helpers with draft support, and preview snapshot management — all framework-agnostic.
+
+## Peer Dependencies
+
+- `convex` — Convex backend
+- `react` — React 18+
+- `@tanstack/react-table` — Table utilities for admin column generation

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { ComponentType } from 'react';
 import * as convex_server from 'convex/server';
-import { TableDefinition, GenericDataModel, GenericMutationCtx, GenericQueryCtx, TableNamesInDataModel, PaginationOptions } from 'convex/server';
-import { VObject, GenericValidator, ObjectType, PropertyValidators } from 'convex/values';
+import { TableDefinition, GenericDataModel, GenericMutationCtx, GenericQueryCtx, QueryBuilder, RegisteredQuery, TableNamesInDataModel, PaginationOptions } from 'convex/server';
+import { VObject, GenericValidator, ObjectType, PropertyValidators, v } from 'convex/values';
 import { ColumnDef } from '@tanstack/react-table';
 import { ZodTypeAny, z } from 'zod';
 
@@ -893,6 +893,12 @@ interface VexCollection<TFields extends Record<string, any> = any, TExtraKeys ex
      * Auth adapter collections default to `false` — set explicitly to opt in.
      */
     generateApi?: boolean;
+    /**
+     * Internal marker set by resolveMediaCollection().
+     * When true, ExtractFieldKeys includes DefaultMediaFieldKeys.
+     * @internal — do not set manually.
+     */
+    _isMedia?: true;
     /**
      * TypeScript interface name used in generated `vex.types.ts`.
      * If not set, auto-generated from slug via PascalCase conversion.
@@ -1094,6 +1100,11 @@ interface AdminConfig {
     };
     /** Global live preview defaults */
     livePreview?: AdminLivePreviewConfig;
+    /** Onboarding tour configuration */
+    onboarding: {
+        /** Whether the onboarding tour is disabled. Default: false (tour enabled) */
+        disabled: boolean;
+    };
 }
 /**
  * Admin page metadata configuration.
@@ -1178,6 +1189,22 @@ interface AdminConfigInput {
      * Individual collections can override these breakpoints.
      */
     livePreview?: AdminLivePreviewConfig;
+    /**
+     * Onboarding tour configuration.
+     *
+     * Default:
+     * ```
+     * disabled: false
+     * ```
+     */
+    onboarding?: {
+        /**
+         * Disable the onboarding tour for all users.
+         *
+         * Default: `false`
+         */
+        disabled?: boolean;
+    };
 }
 
 /** Schema generation configuration. */
@@ -1362,7 +1389,9 @@ type ExtractSlug<T> = T extends {
  * @example
  * type K = ExtractFieldKeys<typeof posts>; // "title" | "slug" | "status" | "featured"
  */
-type ExtractFieldKeys<T> = T extends VexCollection<infer TFields, infer TExtraKeys> ? (keyof TFields & string) | (TExtraKeys & string) : T extends VexMediaCollection<infer TFields> ? (keyof TFields & string) | DefaultMediaFieldKeys : T extends VexGlobal<infer TFields> ? keyof TFields & string : never;
+type ExtractFieldKeys<T> = T extends VexCollection<infer TFields, infer TExtraKeys> ? T extends {
+    _isMedia: true;
+} ? (keyof TFields & string) | (TExtraKeys & string) | DefaultMediaFieldKeys : (keyof TFields & string) | (TExtraKeys & string) : T extends VexMediaCollection<infer TFields> ? (keyof TFields & string) | DefaultMediaFieldKeys : T extends VexGlobal<infer TFields> ? keyof TFields & string : never;
 /**
  * Extract the inferred document type from a VexCollection or VexGlobal.
  * Includes `_id` (system field) and auth extra keys (typed as `string`).
@@ -2286,12 +2315,17 @@ declare function deletePreviewSnapshot<DataModel extends GenericDataModel>(props
     documentId: string;
 }): Promise<void>;
 /**
- * Gets the preview snapshot for a document, if one exists.
+ * Gets the preview data for a document.
+ *
+ * Lookup order:
+ * 1. Preview snapshot (transient, written by admin form on each change)
+ * 2. Latest version from vex_versions (draft or published, excluding autosave/previewSnapshot)
+ * 3. null (fall back to main document)
  *
  * @param props.ctx - Convex query context
  * @param props.collection - Collection slug
  * @param props.documentId - Document ID
- * @returns The snapshot data, or null if no preview snapshot exists
+ * @returns The snapshot data, or null if no preview/version exists
  */
 declare function getPreviewSnapshot<DataModel extends GenericDataModel>(props: {
     ctx: GenericQueryCtx<DataModel>;
@@ -2322,51 +2356,61 @@ interface VexQueryCtx<DataModel extends GenericDataModel = GenericDataModel> ext
     drafts: VexDraftsMode;
 }
 /**
- * Creates a Convex query with built-in draft/snapshot content support.
+ * Create a typed vexQuery builder from your project's query builder.
  *
- * Wraps Convex's `queryGeneric()` to:
- * 1. Automatically add an optional `_vexDrafts` arg (string | boolean)
- * 2. Pass an extended context with `drafts` mode to the handler
- * 3. Preserve full type safety for args and return types
- *
- * The handler receives a `VexQueryCtx` which includes `ctx.drafts`.
- * Use this to decide what content to return.
+ * Call this once in your project to get a `vexQuery` function that
+ * preserves full return type inference from your DataModel.
  *
  * @example
  * ```ts
- * import { vexQuery, getPreviewSnapshot } from "@vexcms/core";
- * import { v } from "convex/values";
+ * // convex/vex/helpers.ts
+ * import { createVexQuery } from "@vexcms/core";
+ * import { query } from "../_generated/server";
+ *
+ * export const vexQuery = createVexQuery(query);
+ * ```
  *
- * export const getPost = vexQuery({
+ * Then use it in your query files:
+ * ```ts
+ * // convex/pages.ts
+ * import { vexQuery } from "./vex/helpers";
+ * import { getPreviewSnapshot } from "@vexcms/core";
+ *
+ * export const getBySlug = vexQuery({
  *   args: { slug: v.string() },
  *   handler: async (ctx, args) => {
- *     const post = await ctx.db
- *       .query("posts")
+ *     const page = await ctx.db
+ *       .query("pages")
  *       .withIndex("by_slug", (q) => q.eq("slug", args.slug))
  *       .first();
- *
- *     if (!post) return null;
- *
+ *     if (!page) return null;
  *     if (ctx.drafts === "snapshot") {
- *       const snapshot = await getPreviewSnapshot({
- *         ctx,
- *         collection: "posts",
- *         documentId: post._id,
- *       });
- *       if (snapshot) {
- *         return { ...post, ...snapshot };
- *       }
+ *       const snapshot = await getPreviewSnapshot({ ctx, collection: "pages", documentId: page._id });
+ *       if (snapshot) return { ...page, ...snapshot };
  *     }
- *
- *     return post;
+ *     return page;
  *   },
  * });
  * ```
  */
+declare function createVexQuery<DataModel extends GenericDataModel>(_queryBuilder: QueryBuilder<DataModel, "public">): <Args extends PropertyValidators, Output>(props: {
+    args: Args;
+    handler: (ctx: VexQueryCtx<DataModel>, args: ObjectType<Args>) => Output | Promise<Output>;
+}) => RegisteredQuery<"public", ObjectType<Args & {
+    _vexDrafts: typeof v.optional<any>;
+}>, Awaited<Output>>;
+/**
+ * Generic vexQuery for use without project-specific types.
+ * Prefer `createVexQuery(query)` for full type inference.
+ *
+ * @deprecated Use `createVexQuery(query)` instead for proper return type inference.
+ */
 declare function vexQuery<Args extends PropertyValidators, Output>(props: {
     args: Args;
     handler: (ctx: VexQueryCtx, args: ObjectType<Args>) => Output | Promise<Output>;
-}): convex_server.RegisteredQuery<"public", any, Promise<Output>>;
+}): RegisteredQuery<"public", ObjectType<Args & {
+    _vexDrafts: typeof v.optional<any>;
+}>, Awaited<Output>>;
 
 declare function listDocuments<DataModel extends GenericDataModel>(props: {
     args: {
@@ -2623,4 +2667,4 @@ declare function planMigration(props: {
     config: VexConfig;
 }): MigrationOp[];
 
-export { ALL_SYSTEM_FIELDS, type AccessAction, type AdminConfig, type AdminConfigInput, type AdminLivePreviewConfig, type AdminMetaInput, type AdminSidebarInput, type AnyVexCollection, type ArrayFieldDef, type AuthCollectionFieldKeys, type AuthTableFieldKeys, type BlockAdminConfig, type BlockDef, type BlocksFieldDef, type CellComponentProps, type CheckboxFieldDef, type ClientMediaConfig, type ClientVexConfig, type CollectionAdminConfig, type CollectionKind, type CollectionQueryImports, DEFAULT_AUTOSAVE_INTERVAL, DEFAULT_BREAKPOINTS, DEFAULT_MAX_VERSIONS_PER_DOC, type DateFieldDef, type DefaultMediaFieldKeys, type DistributiveOmit, type ExtractDocType, type ExtractFieldKeys, type ExtractSlug, type ExtractSlugs, type FieldAdminConfig, type FieldComponentProps, type FieldPermissionResult, type FileStorageAdapter, GENERATED_HEADER, type GeneratedFiles, type GlobalAdminConfig, type ImageUrlFieldDef, type IndexConfig, type InferBlockUnion, type InferFieldType, type InferFieldsType, type JsonFieldDef, LOCKED_MEDIA_FIELDS, type LivePreviewBreakpoint, type LivePreviewConfig, type LockedMediaField, type LookupBySlug, type MediaConfig, type MediaConfigInput, type MergedCollectionResult, type MigrationOp, type NumberFieldDef, OVERRIDABLE_MEDIA_FIELDS, type OverridableMediaField, PREVIEW_SNAPSHOT_DEBOUNCE_MS, type PermissionCallbackProps, type PermissionCheck, type RelationshipFieldDef, type RemovedFieldInfo, type ResolvedCollectionMatch, type ResolvedFieldPermissions, type ResolvedIndex, type ResolvedSearchIndex, type ResourcePermissions, type RichTextDocument, type RichTextElement, type RichTextFieldDef, type RichTextText, type RolesWithPermissions, type SchemaDiff, type SchemaFieldInfo, type SearchIndexConfig, type SelectFieldDef, type SelectOption, type TextFieldDef, type UIFieldDef, type UploadFieldDef, VERSION_SYSTEM_FIELDS, type VersioningFieldKeys, type VersionsConfig, type VexAccessConfig, VexAccessConfigError, VexAccessError, type VexAccessInput, type VexAccessInputBase, type VexAccessInputWithOrg, type VexAuthAdapter, VexAuthConfigError, VexBlockValidationError, type VexCollection, type VexConfig, type VexConfigInput, type VexDraftsMode, type VexEditorAdapter, type VexEditorComponentProps, VexError, type VexField, VexFieldValidationError, type VexGlobal, type VexMediaCollection, VexMediaConfigError, type VexQueryCtx, type VexRenderComponentProps, VexSlugConflictError, addRemovedFieldsAsOptional, array, blocks, checkbox, createDocument, date, defineAccess, defineBlock, defineCollection, defineConfig, defineMediaCollection, deleteDocument, deletePreviewSnapshot, diffSchema, extendTable, extractLivePreviewConfigs, extractUserFields, fieldMetaToZod, findCollectionBySlug, generateCollectionQueries, generateColumns, generateFormDefaultValues, generateFormSchema, generateIndexFile, generateVexSchema, generateVexTypes, getAllCollections, getDocument, getPreviewSnapshot, hasPermission, imageUrl, isMediaCollection, json, listDocuments, makeFieldsOptional, mergeAuthCollectionWithUserCollection, number, planMigration, relationship, resolvePreviewURL, richtext, sanitizeConfigForClient, searchDocuments, select, shouldReloadURL, slugToInterfaceName, text, toTitleCase, ui, updateDocument, upload, upsertPreviewSnapshot, vexQuery };
+export { ALL_SYSTEM_FIELDS, type AccessAction, type AdminConfig, type AdminConfigInput, type AdminLivePreviewConfig, type AdminMetaInput, type AdminSidebarInput, type AnyVexCollection, type ArrayFieldDef, type AuthCollectionFieldKeys, type AuthTableFieldKeys, type BlockAdminConfig, type BlockDef, type BlocksFieldDef, type CellComponentProps, type CheckboxFieldDef, type ClientMediaConfig, type ClientVexConfig, type CollectionAdminConfig, type CollectionKind, type CollectionQueryImports, DEFAULT_AUTOSAVE_INTERVAL, DEFAULT_BREAKPOINTS, DEFAULT_MAX_VERSIONS_PER_DOC, type DateFieldDef, type DefaultMediaFieldKeys, type DistributiveOmit, type ExtractDocType, type ExtractFieldKeys, type ExtractSlug, type ExtractSlugs, type FieldAdminConfig, type FieldComponentProps, type FieldPermissionResult, type FileStorageAdapter, GENERATED_HEADER, type GeneratedFiles, type GlobalAdminConfig, type ImageUrlFieldDef, type IndexConfig, type InferBlockUnion, type InferFieldType, type InferFieldsType, type JsonFieldDef, LOCKED_MEDIA_FIELDS, type LivePreviewBreakpoint, type LivePreviewConfig, type LockedMediaField, type LookupBySlug, type MediaConfig, type MediaConfigInput, type MergedCollectionResult, type MigrationOp, type NumberFieldDef, OVERRIDABLE_MEDIA_FIELDS, type OverridableMediaField, PREVIEW_SNAPSHOT_DEBOUNCE_MS, type PermissionCallbackProps, type PermissionCheck, type RelationshipFieldDef, type RemovedFieldInfo, type ResolvedCollectionMatch, type ResolvedFieldPermissions, type ResolvedIndex, type ResolvedSearchIndex, type ResourcePermissions, type RichTextDocument, type RichTextElement, type RichTextFieldDef, type RichTextText, type RolesWithPermissions, type SchemaDiff, type SchemaFieldInfo, type SearchIndexConfig, type SelectFieldDef, type SelectOption, type TextFieldDef, type UIFieldDef, type UploadFieldDef, VERSION_SYSTEM_FIELDS, type VersioningFieldKeys, type VersionsConfig, type VexAccessConfig, VexAccessConfigError, VexAccessError, type VexAccessInput, type VexAccessInputBase, type VexAccessInputWithOrg, type VexAuthAdapter, VexAuthConfigError, VexBlockValidationError, type VexCollection, type VexConfig, type VexConfigInput, type VexDraftsMode, type VexEditorAdapter, type VexEditorComponentProps, VexError, type VexField, VexFieldValidationError, type VexGlobal, type VexMediaCollection, VexMediaConfigError, type VexQueryCtx, type VexRenderComponentProps, VexSlugConflictError, addRemovedFieldsAsOptional, array, blocks, checkbox, createDocument, createVexQuery, date, defineAccess, defineBlock, defineCollection, defineConfig, defineMediaCollection, deleteDocument, deletePreviewSnapshot, diffSchema, extendTable, extractLivePreviewConfigs, extractUserFields, fieldMetaToZod, findCollectionBySlug, generateCollectionQueries, generateColumns, generateFormDefaultValues, generateFormSchema, generateIndexFile, generateVexSchema, generateVexTypes, getAllCollections, getDocument, getPreviewSnapshot, hasPermission, imageUrl, isMediaCollection, json, listDocuments, makeFieldsOptional, mergeAuthCollectionWithUserCollection, number, planMigration, relationship, resolvePreviewURL, richtext, sanitizeConfigForClient, searchDocuments, select, shouldReloadURL, slugToInterfaceName, text, toTitleCase, ui, updateDocument, upload, upsertPreviewSnapshot, vexQuery };

package/dist/index.js

@@ -137,6 +137,9 @@ var BASE_VEX_CONFIG = {
     user: "users",
     sidebar: {
       hideGlobals: false
+    },
+    onboarding: {
+      disabled: false
     }
   },
   schema: {
@@ -170,7 +173,8 @@ function resolveMediaCollection(props) {
     fields: defaults,
     tableName: props.mediaCollection.tableName,
     labels: props.mediaCollection.labels,
-    admin: adminConfig
+    admin: adminConfig,
+    _isMedia: true
   };
 }
 function defineConfig(vexConfig) {
@@ -189,6 +193,10 @@ function defineConfig(vexConfig) {
         ...BASE_VEX_CONFIG.admin.sidebar,
         ...vexConfig.admin?.sidebar
       },
+      onboarding: {
+        ...BASE_VEX_CONFIG.admin.onboarding,
+        ...vexConfig.admin?.onboarding
+      },
       livePreview: vexConfig.admin?.livePreview
     },
     schema: {
@@ -1956,7 +1964,7 @@ function fieldToTypeString(props) {
     case "json":
       return "Record<string, unknown>";
     case "richtext":
-      return "any";
+      return "RichTextDocument";
     case "ui":
       return "never";
     case "select": {
@@ -2105,10 +2113,37 @@ function generateVexTypes(props) {
   if (config.collections.length > 0 || (config.media?.collections?.length ?? 0) > 0 || config.globals.length > 0) {
     needsIdImport = true;
   }
+  let needsRichTextImport = false;
+  function checkForRichTextFields(fields) {
+    for (const field of Object.values(fields)) {
+      if (field.type === "richtext") {
+        needsRichTextImport = true;
+      }
+    }
+  }
+  for (const col of config.collections) {
+    checkForRichTextFields(col.fields);
+  }
+  if (config.media?.collections) {
+    for (const col of config.media.collections) {
+      checkForRichTextFields(col.fields);
+    }
+  }
+  for (const g of config.globals) {
+    checkForRichTextFields(g.fields);
+  }
+  for (const block of blocksBySlug.values()) {
+    checkForRichTextFields(block.fields);
+  }
   parts.push("// \u26A0\uFE0F AUTO-GENERATED BY VEX CMS \u2014 DO NOT EDIT \u26A0\uFE0F");
   parts.push("");
   if (needsIdImport) {
     parts.push("import type { Id } from './_generated/dataModel';");
+  }
+  if (needsRichTextImport) {
+    parts.push("import type { RichTextDocument } from '@vexcms/core';");
+  }
+  if (needsIdImport || needsRichTextImport) {
     parts.push("");
   }
   const sortedBlockSlugs = [...blocksBySlug.keys()].sort();
@@ -2399,12 +2434,31 @@ async function deletePreviewSnapshot(props) {
   }
 }
 async function getPreviewSnapshot(props) {
-  const entry = await props.ctx.db.query("vex_versions").withIndex(
+  const previewEntry = await props.ctx.db.query("vex_versions").withIndex(
     "by_document_status",
     (q) => q.eq("collection", props.collection).eq("documentId", props.documentId).eq("status", "previewSnapshot")
   ).first();
-  if (!entry) return null;
-  return entry.snapshot;
+  if (previewEntry) {
+    return previewEntry.snapshot;
+  }
+  const allVersions = await props.ctx.db.query("vex_versions").withIndex(
+    "by_document",
+    (q) => q.eq("collection", props.collection).eq("documentId", props.documentId)
+  ).collect();
+  let latestVersion = null;
+  let maxVersion = -1;
+  for (const v2 of allVersions) {
+    if (v2.status === "previewSnapshot" || v2.status === "autosave") continue;
+    const ver = v2.version;
+    if (ver > maxVersion) {
+      maxVersion = ver;
+      latestVersion = v2;
+    }
+  }
+  if (latestVersion) {
+    return latestVersion.snapshot;
+  }
+  return null;
 }
 
 // src/convex/vexQuery.ts
@@ -2412,6 +2466,30 @@ import {
   queryGeneric
 } from "convex/server";
 import { v } from "convex/values";
+function wrapHandler(handler) {
+  return async (ctx, args) => {
+    const { _vexDrafts, ...userArgs } = args;
+    const drafts = _vexDrafts !== void 0 ? _vexDrafts : "snapshot";
+    const vexCtx = Object.assign(
+      Object.create(Object.getPrototypeOf(ctx)),
+      ctx,
+      { drafts }
+    );
+    return handler(vexCtx, userArgs);
+  };
+}
+function createVexQuery(_queryBuilder) {
+  return (props) => {
+    const mergedArgs = {
+      ...props.args,
+      _vexDrafts: v.optional(v.union(v.literal("snapshot"), v.boolean()))
+    };
+    return queryGeneric({
+      args: mergedArgs,
+      handler: wrapHandler(props.handler)
+    });
+  };
+}
 function vexQuery(props) {
   const mergedArgs = {
     ...props.args,
@@ -2419,14 +2497,7 @@ function vexQuery(props) {
   };
   return queryGeneric({
     args: mergedArgs,
-    handler: async (ctx, args) => {
-      const { _vexDrafts, ...userArgs } = args;
-      const drafts = _vexDrafts !== void 0 ? _vexDrafts : "snapshot";
-      const vexCtx = Object.assign(Object.create(Object.getPrototypeOf(ctx)), ctx, {
-        drafts
-      });
-      return props.handler(vexCtx, userArgs);
-    }
+    handler: wrapHandler(props.handler)
   });
 }
 
@@ -3106,6 +3177,7 @@ export {
   blocks,
   checkbox,
   createDocument,
+  createVexQuery,
   date,
   defineAccess,
   defineBlock,