convex 0.12.1 → 0.12.2-nobin

package/api-extractor-configs/temp/api-tmp.api.md

@@ -32,14 +32,25 @@ export type ApiFromModules<Modules extends Record<string, Record<string, any>>>
     }>>>;
 };
 
+// Warning: (ae-forgotten-export) The symbol "Value" needs to be exported by the entry point index.d.ts
+//
+// @public
+export type ArgsAndOptions<F extends (args?: Record<string, Value>) => any, Options> = Parameters<F>["length"] extends 0 ? [
+args?: {},
+options?: Options
+] : [args: Parameters<F>[0], options?: Options];
+
+// @public
+export type ArgsObject<F extends (args?: Record<string, Value>) => any> = Parameters<F>["length"] extends 0 ? {} : Parameters<F>[0] & Record<string, Value>;
+
 // @public
 export type GenericAPI = {
-    publicQueries: Record<string, (...args: any[]) => any>;
-    allQueries: Record<string, (...args: any[]) => any>;
-    publicMutations: Record<string, (...args: any[]) => any>;
-    allMutations: Record<string, (...args: any[]) => any>;
-    publicActions: Record<string, (...args: any[]) => any>;
-    allActions: Record<string, (...args: any[]) => any>;
+    publicQueries: Record<string, ConvexFunction>;
+    allQueries: Record<string, ConvexFunction>;
+    publicMutations: Record<string, ConvexFunction>;
+    allMutations: Record<string, ConvexFunction>;
+    publicActions: Record<string, ConvexFunction>;
+    allActions: Record<string, ConvexFunction>;
 };
 
 // @public
@@ -54,6 +65,11 @@ export type NamedMutation<API extends GenericAPI, Name extends MutationNames<API
 // @public
 export type NamedQuery<API extends GenericAPI, Name extends QueryNames<API>> = API["allQueries"][Name];
 
+// @public
+export type OptionalRestArgs<F extends (args?: Record<string, Value>) => any> = Parameters<F>["length"] extends 0 ? [
+args?: {}
+] : [args: Parameters<F>[0]];
+
 // @public
 export type PublicActionNames<API extends GenericAPI> = keyof API["publicActions"] & string;
 
@@ -68,10 +84,11 @@ export type QueryNames<API extends GenericAPI> = keyof API["allQueries"] & strin
 
 // Warnings were encountered during analysis:
 //
-// src/api/index.ts:172:3 - (ae-forgotten-export) The symbol "Expand" needs to be exported by the entry point index.d.ts
-// src/api/index.ts:172:3 - (ae-forgotten-export) The symbol "ConvertToClientFunctions" needs to be exported by the entry point index.d.ts
-// src/api/index.ts:172:3 - (ae-forgotten-export) The symbol "PickByValue" needs to be exported by the entry point index.d.ts
-// src/api/index.ts:172:3 - (ae-forgotten-export) The symbol "MergeAllExports" needs to be exported by the entry point index.d.ts
+// src/api/index.ts:20:3 - (ae-forgotten-export) The symbol "ConvexFunction" needs to be exported by the entry point index.d.ts
+// src/api/index.ts:227:3 - (ae-forgotten-export) The symbol "Expand" needs to be exported by the entry point index.d.ts
+// src/api/index.ts:227:3 - (ae-forgotten-export) The symbol "ConvertToClientFunctions" needs to be exported by the entry point index.d.ts
+// src/api/index.ts:227:3 - (ae-forgotten-export) The symbol "PickByValue" needs to be exported by the entry point index.d.ts
+// src/api/index.ts:227:3 - (ae-forgotten-export) The symbol "MergeAllExports" needs to be exported by the entry point index.d.ts
 
 // (No @packageDocumentation comment for this package)
 

package/api-extractor-configs/temp/browser-tmp.api.md

@@ -32,6 +32,17 @@ export type ApiFromModules<Modules extends Record<string, Record<string, any>>>
     }>>>;
 };
 
+// Warning: (ae-forgotten-export) The symbol "Value" needs to be exported by the entry point index.d.ts
+//
+// @public
+export type ArgsAndOptions<F extends (args?: Record<string, Value>) => any, Options> = Parameters<F>["length"] extends 0 ? [
+args?: {},
+options?: Options
+] : [args: Parameters<F>[0], options?: Options];
+
+// @public
+export type ArgsObject<F extends (args?: Record<string, Value>) => any> = Parameters<F>["length"] extends 0 ? {} : Parameters<F>[0] & Record<string, Value>;
+
 // @public
 export interface ClientOptions {
     unsavedChangesWarning?: boolean;
@@ -42,11 +53,11 @@ export interface ClientOptions {
 // @public
 export class ConvexHttpClient<API extends GenericAPI> {
     constructor(address: string);
-    action<Name extends PublicActionNames<API>>(name: Name): (...args: Parameters<NamedAction<API, Name>>) => Promise<ReturnType<NamedAction<API, Name>>>;
+    action<Name extends PublicActionNames<API>>(name: Name, ...args: OptionalRestArgs<NamedAction<API, Name>>): Promise<ReturnType<NamedAction<API, Name>>>;
     backendUrl(): string;
     clearAuth(): void;
-    mutation<Name extends PublicMutationNames<API>>(name: Name): (...args: Parameters<NamedMutation<API, Name>>) => Promise<ReturnType<NamedMutation<API, Name>>>;
-    query<Name extends PublicQueryNames<API>>(name: Name): (...args: Parameters<NamedQuery<API, Name>>) => Promise<ReturnType<NamedQuery<API, Name>>>;
+    mutation<Name extends PublicMutationNames<API>>(name: Name, ...args: OptionalRestArgs<NamedMutation<API, Name>>): Promise<ReturnType<NamedMutation<API, Name>>>;
+    query<Name extends PublicQueryNames<API>>(name: Name, ...args: OptionalRestArgs<NamedQuery<API, Name>>): Promise<ReturnType<NamedQuery<API, Name>>>;
     setAuth(value: string): void;
     // @internal
     setDebug(debug: boolean): void;
@@ -54,19 +65,19 @@ export class ConvexHttpClient<API extends GenericAPI> {
 
 // @public
 export type GenericAPI = {
-    publicQueries: Record<string, (...args: any[]) => any>;
-    allQueries: Record<string, (...args: any[]) => any>;
-    publicMutations: Record<string, (...args: any[]) => any>;
-    allMutations: Record<string, (...args: any[]) => any>;
-    publicActions: Record<string, (...args: any[]) => any>;
-    allActions: Record<string, (...args: any[]) => any>;
+    publicQueries: Record<string, ConvexFunction>;
+    allQueries: Record<string, ConvexFunction>;
+    publicMutations: Record<string, ConvexFunction>;
+    allMutations: Record<string, ConvexFunction>;
+    publicActions: Record<string, ConvexFunction>;
+    allActions: Record<string, ConvexFunction>;
 };
 
 // @public
 export class InternalConvexClient {
     constructor(address: string, onTransition: (updatedQueries: QueryToken[]) => void, options?: ClientOptions);
     // (undocumented)
-    action<Args extends any[]>(udfPath: string, args: Args): Promise<any>;
+    action(udfPath: string, args: Record<string, Value>): Promise<any>;
     // (undocumented)
     clearAuth(): void;
     // (undocumented)
@@ -75,28 +86,22 @@ export class InternalConvexClient {
     connectionState(): ConnectionState;
     // (undocumented)
     hasAuth(): boolean;
-    // Warning: (ae-forgotten-export) The symbol "Value" needs to be exported by the entry point index.d.ts
-    localQueryResult(udfPath: string, args: any[]): Value | undefined;
+    localQueryResult(udfPath: string, args: Record<string, Value>): Value | undefined;
     // (undocumented)
-    mutate<Args extends any[]>(udfPath: string, args: Args, optimisticUpdate?: OptimisticUpdate<GenericAPI, Args> | null): Promise<any>;
-    queryJournal(name: string, args: any[]): QueryJournal | undefined;
+    mutate<Args extends Record<string, Value>>(udfPath: string, args: Args, optimisticUpdate?: OptimisticUpdate<GenericAPI, Args> | null): Promise<any>;
+    queryJournal(name: string, args: Record<string, Value>): QueryJournal | undefined;
     // @internal (undocumented)
     setAdminAuth(value: string, fakeUserIdentity?: UserIdentityAttributes): void;
     // Warning: (ae-forgotten-export) The symbol "AuthTokenFetcher" needs to be exported by the entry point index.d.ts
     //
     // (undocumented)
     setAuth(fetchToken: AuthTokenFetcher): Promise<void>;
-    subscribe(name: string, args: any[], journal?: QueryJournal): {
+    subscribe(name: string, args?: Record<string, Value>, journal?: QueryJournal): {
         queryToken: QueryToken;
         unsubscribe: () => void;
     };
 }
 
-// @public
-export interface Mutation<F extends (...args: any[]) => Promise<any>> {
-    (...args: Parameters<F>): Promise<Awaited<ReturnType<F>>>;
-}
-
 // @public
 export type MutationNames<API extends GenericAPI> = keyof API["allMutations"] & string;
 
@@ -112,15 +117,20 @@ export type NamedQuery<API extends GenericAPI, Name extends QueryNames<API>> = A
 // @public
 export interface OptimisticLocalStore<API extends GenericAPI = GenericAPI> {
     getAllQueries<Name extends PublicQueryNames<API>>(name: Name): {
-        args: Parameters<NamedQuery<API, Name>>;
+        args: ArgsObject<NamedQuery<API, Name>>;
         value: undefined | ReturnType<NamedQuery<API, Name>>;
     }[];
-    getQuery<Name extends PublicQueryNames<API>>(name: Name, args: Parameters<NamedQuery<API, Name>>): undefined | ReturnType<NamedQuery<API, Name>>;
-    setQuery<Name extends PublicQueryNames<API>>(name: Name, args: Parameters<NamedQuery<API, Name>>, value: undefined | ReturnType<NamedQuery<API, Name>>): void;
+    getQuery<Name extends PublicQueryNames<API>>(name: Name, ...args: OptionalRestArgs<NamedQuery<API, Name>>): undefined | ReturnType<NamedQuery<API, Name>>;
+    setQuery<Name extends PublicQueryNames<API>>(name: Name, args: ArgsObject<NamedQuery<API, Name>>, value: undefined | ReturnType<NamedQuery<API, Name>>): void;
 }
 
 // @public
-export type OptimisticUpdate<API extends GenericAPI, Arguments extends Value[]> = (localQueryStore: OptimisticLocalStore<API>, ...args: Arguments) => void;
+export type OptimisticUpdate<API extends GenericAPI, Args extends Record<string, Value>> = (localQueryStore: OptimisticLocalStore<API>, args: Args) => void;
+
+// @public
+export type OptionalRestArgs<F extends (args?: Record<string, Value>) => any> = Parameters<F>["length"] extends 0 ? [
+args?: {}
+] : [args: Parameters<F>[0]];
 
 // @public
 export type PublicActionNames<API extends GenericAPI> = keyof API["publicActions"] & string;
@@ -131,11 +141,6 @@ export type PublicMutationNames<API extends GenericAPI> = keyof API["publicMutat
 // @public
 export type PublicQueryNames<API extends GenericAPI> = keyof API["publicQueries"] & string;
 
-// @public
-export interface Query<F extends (...args: any[]) => Promise<any>> {
-    (...args: Parameters<F>): Promise<Awaited<ReturnType<F>>>;
-}
-
 // @public
 export type QueryJournal = string | null;
 
@@ -164,10 +169,11 @@ export type UserIdentityAttributes = Omit<UserIdentity, "updatedAt" | "issuer">
 
 // Warnings were encountered during analysis:
 //
-// src/api/index.ts:172:3 - (ae-forgotten-export) The symbol "Expand" needs to be exported by the entry point index.d.ts
-// src/api/index.ts:172:3 - (ae-forgotten-export) The symbol "ConvertToClientFunctions" needs to be exported by the entry point index.d.ts
-// src/api/index.ts:172:3 - (ae-forgotten-export) The symbol "PickByValue" needs to be exported by the entry point index.d.ts
-// src/api/index.ts:172:3 - (ae-forgotten-export) The symbol "MergeAllExports" needs to be exported by the entry point index.d.ts
+// src/api/index.ts:20:3 - (ae-forgotten-export) The symbol "ConvexFunction" needs to be exported by the entry point index.d.ts
+// src/api/index.ts:227:3 - (ae-forgotten-export) The symbol "Expand" needs to be exported by the entry point index.d.ts
+// src/api/index.ts:227:3 - (ae-forgotten-export) The symbol "ConvertToClientFunctions" needs to be exported by the entry point index.d.ts
+// src/api/index.ts:227:3 - (ae-forgotten-export) The symbol "PickByValue" needs to be exported by the entry point index.d.ts
+// src/api/index.ts:227:3 - (ae-forgotten-export) The symbol "MergeAllExports" needs to be exported by the entry point index.d.ts
 
 // (No @packageDocumentation comment for this package)
 

package/api-extractor-configs/temp/react-clerk-tmp.api.md

@@ -4,14 +4,13 @@
 
 ```ts
 
-import { ClerkProviderProps } from '@clerk/clerk-react';
 import { ReactNode } from 'react';
 
 // @public
 export function ConvexProviderWithClerk({ children, client, }: {
     children: ReactNode;
     client: IConvexReactClient;
-} & ClerkProviderProps): JSX.Element;
+}): JSX.Element;
 
 // Warnings were encountered during analysis:
 //

package/api-extractor-configs/temp/react-tmp.api.md

@@ -10,15 +10,17 @@ import { ReactNode } from 'react';
 // @public
 export function Authenticated({ children }: {
     children: ReactNode;
-}): ReactNode;
+}): JSX.Element | null;
 
 // @public
 export function AuthLoading({ children }: {
     children: ReactNode;
-}): ReactNode;
+}): JSX.Element | null;
 
 // @public
-export type AuthTokenFetcher = () => Promise<string | null | undefined>;
+export type AuthTokenFetcher = (args: {
+    forceRefreshToken: boolean;
+}) => Promise<string | null | undefined>;
 
 // @public
 export type ConvexAuthState = {
@@ -39,7 +41,9 @@ export function ConvexProviderWithAuth({ children, client, useAuth, }: {
     useAuth: () => {
         isLoading: boolean;
         isAuthenticated: boolean;
-        fetchAccessToken: () => Promise<string | null>;
+        fetchAccessToken: (args: {
+            forceRefreshToken: boolean;
+        }) => Promise<string | null>;
     };
 }): JSX.Element;
 
@@ -62,9 +66,10 @@ export class ConvexReactClient<API extends GenericAPI> {
     setAdminAuth(token: string, identity?: UserIdentityAttributes): void;
     setAuth(fetchToken: AuthTokenFetcher): Promise<void>;
     // Warning: (ae-forgotten-export) The symbol "PublicQueryNames" needs to be exported by the entry point index.d.ts
+    // Warning: (ae-forgotten-export) The symbol "ArgsObject" needs to be exported by the entry point index.d.ts
     // Warning: (ae-forgotten-export) The symbol "NamedQuery" needs to be exported by the entry point index.d.ts
     // Warning: (ae-forgotten-export) The symbol "QueryJournal" needs to be exported by the entry point index.d.ts
-    watchQuery<Name extends PublicQueryNames<API>>(name: Name, args: Parameters<NamedQuery<API, Name>>, journal?: QueryJournal): Watch<ReturnType<NamedQuery<API, Name>>>;
+    watchQuery<Name extends PublicQueryNames<API>>(name: Name, args: ArgsObject<NamedQuery<API, Name>>, journal?: QueryJournal): Watch<ReturnType<NamedQuery<API, Name>>>;
 }
 
 // Warning: (ae-forgotten-export) The symbol "OptimisticLocalStore" needs to be exported by the entry point index.d.ts
@@ -72,14 +77,18 @@ export class ConvexReactClient<API extends GenericAPI> {
 // @public
 export function optimisticallyUpdateValueInPaginatedQuery<API extends GenericAPI, Name extends PaginatedQueryNames<API>>(localStore: OptimisticLocalStore<API>, name: Name, args: PaginatedQueryArgs<NamedQuery<API, Name>>, updateValue: (currentValue: PaginatedQueryReturnType<NamedQuery<API, Name>>) => PaginatedQueryReturnType<NamedQuery<API, Name>>): void;
 
+// Warning: (ae-forgotten-export) The symbol "Expand" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "BetterOmit" needs to be exported by the entry point index.d.ts
+//
 // @public
-export type PaginatedQueryArgs<Query extends PaginatedQueryFunction<any, any>> = Query extends PaginatedQueryFunction<infer Args, any> ? Args : never;
+export type PaginatedQueryArgs<Query extends PaginatedQueryFunction<any, any>> = Expand<BetterOmit<Parameters<Query>[0], "paginationOpts">>;
 
-// Warning: (ae-forgotten-export) The symbol "PaginationOptions" needs to be exported by the entry point index.d.ts
 // Warning: (ae-forgotten-export) The symbol "PaginationResult" needs to be exported by the entry point index.d.ts
 //
 // @public
-export type PaginatedQueryFunction<Args extends any[], ReturnType> = (paginationOptions: PaginationOptions, ...args: Args) => PaginationResult<ReturnType>;
+export type PaginatedQueryFunction<Args extends object, ReturnType> = (args: {
+    paginationOpts: PaginationOptions;
+} & Args) => PaginationResult<ReturnType>;
 
 // Warning: (ae-forgotten-export) The symbol "PickByValue" needs to be exported by the entry point index.d.ts
 //
@@ -91,8 +100,9 @@ export type PaginatedQueryReturnType<Query extends PaginatedQueryFunction<any, a
 
 // @public
 export interface ReactAction<API extends GenericAPI, Name extends PublicActionNames<API>> {
+    // Warning: (ae-forgotten-export) The symbol "OptionalRestArgs" needs to be exported by the entry point index.d.ts
     // Warning: (ae-forgotten-export) The symbol "NamedAction" needs to be exported by the entry point index.d.ts
-    (...args: Parameters<NamedAction<API, Name>>): Promise<ReturnType<NamedAction<API, Name>>>;
+    (...args: OptionalRestArgs<NamedAction<API, Name>>): Promise<ReturnType<NamedAction<API, Name>>>;
 }
 
 // @public
@@ -105,21 +115,21 @@ export interface ReactClientOptions {
 // @public
 export interface ReactMutation<API extends GenericAPI, Name extends PublicMutationNames<API>> {
     // Warning: (ae-forgotten-export) The symbol "NamedMutation" needs to be exported by the entry point index.d.ts
-    (...args: Parameters<NamedMutation<API, Name>>): Promise<ReturnType<NamedMutation<API, Name>>>;
+    (...args: OptionalRestArgs<NamedMutation<API, Name>>): Promise<ReturnType<NamedMutation<API, Name>>>;
     // Warning: (ae-forgotten-export) The symbol "OptimisticUpdate" needs to be exported by the entry point index.d.ts
-    withOptimisticUpdate(optimisticUpdate: OptimisticUpdate<API, Parameters<NamedMutation<API, Name>>>): ReactMutation<API, Name>;
+    withOptimisticUpdate(optimisticUpdate: OptimisticUpdate<API, ArgsObject<NamedMutation<API, Name>>>): ReactMutation<API, Name>;
 }
 
 // @public
 export type RequestForQueries = Record<string, {
     name: string;
-    args: Value[];
+    args: Record<string, Value>;
 }>;
 
 // @public
 export function Unauthenticated({ children }: {
     children: ReactNode;
-}): ReactNode;
+}): JSX.Element | null;
 
 // @public
 export type UseActionForAPI<API extends GenericAPI> = <Name extends PublicActionNames<API>>(name: Name) => ReactAction<API, Name>;
@@ -146,14 +156,14 @@ export type UseMutationForAPI<API extends GenericAPI> = <Name extends PublicMuta
 export function useMutationGeneric<API extends GenericAPI, Name extends PublicMutationNames<API>>(name: Name): ReactMutation<API, Name>;
 
 // @public
-export type UsePaginatedQueryForAPI<API extends GenericAPI> = <Name extends PaginatedQueryNames<API>>(name: Name, options: {
+export type UsePaginatedQueryForAPI<API extends GenericAPI> = <Name extends PaginatedQueryNames<API>>(name: Name, args: PaginatedQueryArgs<NamedQuery<API, Name>>, options: {
     initialNumItems: number;
-}, ...args: PaginatedQueryArgs<NamedQuery<API, Name>>) => UsePaginatedQueryResult<PaginatedQueryReturnType<NamedQuery<API, Name>>>;
+}) => UsePaginatedQueryResult<PaginatedQueryReturnType<NamedQuery<API, Name>>>;
 
 // @public
-export function usePaginatedQueryGeneric(name: string, options: {
+export function usePaginatedQueryGeneric(name: string, args: Record<string, Value>, options: {
     initialNumItems: number;
-}, ...args: Value[]): UsePaginatedQueryResult<any>;
+}): UsePaginatedQueryResult<any>;
 
 // @public
 export type UsePaginatedQueryResult<T> = {
@@ -173,7 +183,7 @@ export type UsePaginatedQueryResult<T> = {
 export type UseQueriesForAPI<API extends GenericAPI> = <QueryNameMap extends Record<string, PublicQueryNames<API>>>(queries: {
     [Identifier in keyof QueryNameMap]: {
         name: QueryNameMap[Identifier];
-        args: Parameters<NamedQuery<API, QueryNameMap[Identifier]>>;
+        args: ArgsObject<NamedQuery<API, QueryNameMap[Identifier]>>;
     };
 }) => {
     [Identifier in keyof QueryNameMap]: ReturnType<NamedQuery<API, QueryNameMap[Identifier]>> | undefined | Error;
@@ -182,16 +192,22 @@ export type UseQueriesForAPI<API extends GenericAPI> = <QueryNameMap extends Rec
 // @public
 export function useQueriesGeneric(queries: RequestForQueries): Record<string, any | undefined | Error>;
 
+// Warning: (ae-forgotten-export) The symbol "ArgsAndOptions" needs to be exported by the entry point index.d.ts
+//
 // @public
-export type UseQueryForAPI<API extends GenericAPI> = <Name extends PublicQueryNames<API>>(name: Name, ...args: Parameters<NamedQuery<API, Name>>) => ReturnType<NamedQuery<API, Name>> | undefined;
+export type UseQueryForAPI<API extends GenericAPI> = <Name extends PublicQueryNames<API>>(name: Name, ...argsAndOptions: ArgsAndOptions<NamedQuery<API, Name>, UseQueryOptions>) => ReturnType<NamedQuery<API, Name>> | undefined;
 
 // @public
-export function useQueryGeneric<API extends GenericAPI, Name extends PublicQueryNames<API>>(name: Name, ...args: Parameters<NamedQuery<API, Name>>): ReturnType<NamedQuery<API, Name>> | undefined;
+export function useQueryGeneric(name: string, args?: Record<string, Value>, _options?: UseQueryOptions): unknown | undefined;
 
 // Warning: (ae-internal-missing-underscore) The name "useQueryInternal" should be prefixed with an underscore because the declaration is marked as @internal
 //
-// @internal (undocumented)
-export function useQueryInternal<API extends GenericAPI, Name extends PublicQueryNames<API>>(convex: ConvexReactClient<API>, name: Name, ...args: Parameters<NamedQuery<API, Name>>): ReturnType<NamedQuery<API, Name>> | undefined;
+// @internal
+export function useQueryInternal(convex: ConvexReactClient<any>, name: string, args?: Record<string, Value>, _options?: UseQueryOptions): unknown | undefined;
+
+// @public
+export interface UseQueryOptions {
+}
 
 // @public
 export interface Watch<T> {
@@ -203,7 +219,8 @@ export interface Watch<T> {
 // Warnings were encountered during analysis:
 //
 // src/react/ConvexAuthState.tsx:64:3 - (ae-forgotten-export) The symbol "IConvexReactClient" needs to be exported by the entry point index.d.ts
-// src/react/use_queries.ts:156:5 - (ae-forgotten-export) The symbol "Value" needs to be exported by the entry point index.d.ts
+// src/react/use_paginated_query.ts:283:5 - (ae-forgotten-export) The symbol "PaginationOptions" needs to be exported by the entry point index.d.ts
+// src/react/use_queries.ts:161:5 - (ae-forgotten-export) The symbol "Value" needs to be exported by the entry point index.d.ts
 
 // (No @packageDocumentation comment for this package)
 

package/api-extractor-configs/temp/schema-tmp.api.md

@@ -27,42 +27,21 @@ export interface DefineSchemaOptions<IsStrict extends boolean> {
     strict?: IsStrict;
 }
 
+// Warning: (ae-forgotten-export) The symbol "Validator" needs to be exported by the entry point index.d.ts
 // Warning: (ae-forgotten-export) The symbol "ExtractDocument" needs to be exported by the entry point index.d.ts
 // Warning: (ae-forgotten-export) The symbol "ExtractFieldPaths" needs to be exported by the entry point index.d.ts
 //
 // @public
-export function defineTable<DocumentSchema extends SchemaType<Record<string, any>, false, any>>(documentSchema: DocumentSchema): TableDefinition<ExtractDocument<DocumentSchema>, ExtractFieldPaths<DocumentSchema>>;
+export function defineTable<DocumentSchema extends Validator<Record<string, any>, false, any>>(documentSchema: DocumentSchema): TableDefinition<ExtractDocument<DocumentSchema>, ExtractFieldPaths<DocumentSchema>>;
 
-// Warning: (ae-forgotten-export) The symbol "ObjectSchemaType" needs to be exported by the entry point index.d.ts
+// Warning: (ae-forgotten-export) The symbol "ObjectValidator" needs to be exported by the entry point index.d.ts
 //
 // @public
-export function defineTable<DocumentSchema extends Record<string, SchemaType<any, any, any>>>(documentSchema: DocumentSchema): TableDefinition<ExtractDocument<ObjectSchemaType<DocumentSchema>>, ExtractFieldPaths<ObjectSchemaType<DocumentSchema>>>;
+export function defineTable<DocumentSchema extends Record<string, Validator<any, any, any>>>(documentSchema: DocumentSchema): TableDefinition<ExtractDocument<ObjectValidator<DocumentSchema>>, ExtractFieldPaths<ObjectValidator<DocumentSchema>>>;
 
 // @public
 export type GenericSchema = Record<string, TableDefinition>;
 
-// @public
-export type Infer<SType extends SchemaType<any, any, any>> = SType["type"];
-
-// @public
-export const s: {
-    id<TableName extends string>(tableName: TableName): SchemaType<Id<TableName>, false, never>;
-    null(): SchemaType<null>;
-    number(): SchemaType<number>;
-    bigint(): SchemaType<bigint>;
-    boolean(): SchemaType<boolean>;
-    string(): SchemaType<string>;
-    bytes(): SchemaType<ArrayBuffer>;
-    literal<T extends string | number | bigint | boolean>(literal: T): SchemaType<T, false, never>;
-    array<T_1>(values: SchemaType<T_1, false, any>): SchemaType<T_1[], false, never>;
-    set<T_2>(values: SchemaType<T_2, false, any>): SchemaType<Set<T_2>, false, never>;
-    map<K, V>(keys: SchemaType<K, false, any>, values: SchemaType<V, false, any>): SchemaType<Map<K, V>, false, never>;
-    object<T_3 extends Record<string, SchemaType<any, any, any>>>(schema: T_3): ObjectSchemaType<T_3>;
-    union<T_4 extends [SchemaType<any, false, any>, SchemaType<any, false, any>, ...SchemaType<any, false, any>[]]>(...schemaTypes: T_4): SchemaType<T_4[number]["type"], false, T_4[number]["fieldPaths"]>;
-    any(): SchemaType<any, false, string>;
-    optional<T_5 extends SchemaType<any, false, any>>(inner: T_5): SchemaType<T_5["type"], true, T_5["fieldPaths"]>;
-};
-
 // @public
 export class SchemaDefinition<Schema extends GenericSchema, IsStrict extends boolean> {
     // @internal
@@ -75,25 +54,6 @@ export class SchemaDefinition<Schema extends GenericSchema, IsStrict extends boo
     tables: Schema;
 }
 
-// @public
-export class SchemaType<TypeScriptType, IsOptional extends boolean = false, FieldPaths extends string = never> {
-    constructor(type: JsonSchemaType, optional: boolean, referencedTableNames?: Set<string>);
-    // (undocumented)
-    readonly fieldPaths: FieldPaths;
-    // (undocumented)
-    readonly isOptional: IsOptional;
-    // Warning: (ae-forgotten-export) The symbol "JsonSchemaType" needs to be exported by the entry point index.d.ts
-    //
-    // (undocumented)
-    readonly jsonSchemaType: JsonSchemaType;
-    // (undocumented)
-    readonly optional: boolean;
-    // (undocumented)
-    readonly referencedTableNames: Set<string>;
-    // (undocumented)
-    readonly type: TypeScriptType;
-}
-
 // @public
 export interface SearchIndexConfig<SearchField extends string, FilterFields extends string> {
     filterFields?: FilterFields[];
@@ -107,7 +67,7 @@ export interface SearchIndexConfig<SearchField extends string, FilterFields exte
 // @public
 export class TableDefinition<Document extends GenericDocument = GenericDocument, FieldPaths extends string = string, Indexes extends GenericTableIndexes = {}, SearchIndexes extends GenericTableSearchIndexes = {}> {
     // @internal
-    constructor(documentType: SchemaType<any, any, any>);
+    constructor(documentType: Validator<any, any, any>);
     // @internal
     export(): {
         indexes: {
@@ -136,10 +96,9 @@ export class TableDefinition<Document extends GenericDocument = GenericDocument,
 
 // Warnings were encountered during analysis:
 //
-// src/schema/index.ts:117:15 - (ae-forgotten-export) The symbol "Id" needs to be exported by the entry point index.d.ts
-// src/schema/index.ts:692:13 - (ae-forgotten-export) The symbol "Expand" needs to be exported by the entry point index.d.ts
-// src/schema/index.ts:692:13 - (ae-forgotten-export) The symbol "IdField" needs to be exported by the entry point index.d.ts
-// src/schema/index.ts:694:13 - (ae-forgotten-export) The symbol "SystemIndexes" needs to be exported by the entry point index.d.ts
+// src/schema/index.ts:448:13 - (ae-forgotten-export) The symbol "Expand" needs to be exported by the entry point index.d.ts
+// src/schema/index.ts:448:13 - (ae-forgotten-export) The symbol "IdField" needs to be exported by the entry point index.d.ts
+// src/schema/index.ts:450:13 - (ae-forgotten-export) The symbol "SystemIndexes" needs to be exported by the entry point index.d.ts
 
 // (No @packageDocumentation comment for this package)