on-zero 0.7.10 → 0.8.0

package/src/server.ts

@@ -1,13 +1,8 @@
 import { createBuilder, mustGetQuery } from '@rocicorp/zero'
 import { asQueryInternals } from '@rocicorp/zero/bindings'
-// type-only: @rocicorp/zero/server pulls node and postgresql formatting in, and
-// importing it eagerly means merely importing on-zero/server drags that into a
-// browser worker. the real import happens inside transformQueryRequest, which
-// only ever runs on a server.
-import type { handleQueryRequest as zeroHandleQueryRequest } from '@rocicorp/zero/server'
-import { createAsyncContext } from '@take-out/helpers'
 
 import { createPermissions } from './createPermissions'
+import { createAsyncContext } from './helpers/asyncContext'
 import { createMutators } from './helpers/createMutators'
 import { getScopedAuthData, runWithAuthScope } from './helpers/mutatorContext'
 import { runWithQueryContext } from './helpers/queryContext'
@@ -19,6 +14,7 @@ import { setRunner } from './zeroRunner'
 
 import type {
   AdminRoleMode,
+  AsyncActionEnvelope,
   AuthData,
   GenericModels,
   MutatorContext,
@@ -32,6 +28,11 @@ import type {
   Schema as ZeroSchema,
   ServerTransaction as RocicorpServerTransaction,
 } from '@rocicorp/zero'
+// type-only: @rocicorp/zero/server pulls node and postgresql formatting in, and
+// importing it eagerly means merely importing on-zero/server drags that into a
+// browser worker. the real import happens inside transformQueryRequest, which
+// only ever runs on a server.
+import type { handleQueryRequest as zeroHandleQueryRequest } from '@rocicorp/zero/server'
 
 export type JsonPrimitive = string | number | boolean | null
 export type JsonValue =
@@ -59,16 +60,16 @@ export interface ZeroServerApplicationTransaction {
   exec(
     sql: string,
     params?: readonly unknown[],
-    metadata?: SqlStatementMetadata,
+    metadata?: SqlStatementMetadata
   ): Promise<{ readonly changes: number }>
   query<Row extends Record<string, unknown> = Record<string, unknown>>(
     sql: string,
-    params?: readonly unknown[],
+    params?: readonly unknown[]
   ): Promise<readonly Row[]>
   queryAst<Result = unknown>(
     ast: JsonValue,
     format: TransactionQueryFormat,
-    queryName?: string,
+    queryName?: string
   ): Promise<Result>
 }
 
@@ -81,7 +82,7 @@ export type ZeroServerMutationContext = {
   readonly claims: NormalizedClaims
   defer(
     effect: () => void | Promise<void>,
-    options?: { readonly barrier?: boolean },
+    options?: { readonly barrier?: boolean }
   ): void
 }
 
@@ -100,11 +101,11 @@ export interface ZeroServerExecutor<Schema extends ZeroSchema> {
   execute(name: string, args: JsonValue, claims: NormalizedClaims): Promise<void>
   transaction<Value>(
     claims: NormalizedClaims,
-    work: (tx: ZeroServerTransaction<Schema>) => Value | Promise<Value>,
+    work: (tx: ZeroServerTransaction<Schema>) => Value | Promise<Value>
   ): Promise<Value>
   query<Result>(
     claims: NormalizedClaims,
-    work: (tx: ZeroServerTransaction<Schema>) => Result | Promise<Result>,
+    work: (tx: ZeroServerTransaction<Schema>) => Result | Promise<Result>
   ): Promise<Result>
 }
 
@@ -134,21 +135,31 @@ export type ServerMutate<Models extends GenericModels> = {
   [Key in keyof Models]: {
     [K in keyof Models[Key]['mutate']]: Models[Key]['mutate'][K] extends (
       ctx: MutatorContext,
-      arg: infer Arg,
+      arg: infer Arg
     ) => any
       ? (arg: Arg, options?: MutateOptions) => Promise<void>
       : (options?: MutateOptions) => Promise<void>
   }
 }
 
+export type ZeroServerActionsConfig<Action extends AsyncActionEnvelope> = {
+  // used by runtimes that can execute application effects locally.
+  execute(action: Action): void | Promise<void>
+  // when present, this is the selected route. failures do not fall back to
+  // local execution, which prevents an action from running twice.
+  dispatchRemote?(action: Action): void | Promise<void>
+}
+
 export type CreateZeroServerBindingsOptions<
   Schema extends ZeroSchema,
   Models extends GenericModels,
   ServerActions extends Record<string, unknown>,
+  Action extends AsyncActionEnvelope = never,
 > = {
   schema: Schema
   models: Models
   createServerActions: () => ServerActions
+  actions?: ZeroServerActionsConfig<Action>
   queries?: AnyQueryRegistry
   mutations?: Record<string, Record<string, unknown>>
   validateQuery?: ValidateQueryFn
@@ -165,7 +176,7 @@ export type ZeroServerBindings<
   resolveQuery(
     name: string,
     args: readonly JsonValue[],
-    claims: NormalizedClaims,
+    authData: AuthData | null
   ): Promise<JsonValue>
   transformQueryRequest(options: {
     authData: AuthData | null
@@ -174,12 +185,12 @@ export type ZeroServerBindings<
   server(executor: ZeroServerExecutor<Schema>): {
     mutate: ServerMutate<Models>
     transaction<Value>(
-      claims: NormalizedClaims,
-      work: (tx: Transaction) => Value | Promise<Value>,
+      authData: AuthData | null,
+      work: (tx: Transaction) => Value | Promise<Value>
     ): Promise<Value>
     query<Result>(
-      claims: NormalizedClaims,
-      work: (q: QueryBuilder) => Query<any, Schema, Result>,
+      authData: AuthData | null,
+      work: (q: QueryBuilder) => Query<any, Schema, Result>
     ): Promise<HumanReadable<Result>>
   }
 }
@@ -188,8 +199,9 @@ export function createZeroServerBindings<
   Schema extends ZeroSchema,
   Models extends GenericModels,
   ServerActions extends Record<string, unknown>,
+  Action extends AsyncActionEnvelope = never,
 >(
-  options: CreateZeroServerBindingsOptions<Schema, Models, ServerActions>,
+  options: CreateZeroServerBindingsOptions<Schema, Models, ServerActions, Action>
 ): ZeroServerBindings<Schema, Models> {
   setSchema(options.schema, createBuilder(options.schema))
   setEnvironment('server')
@@ -206,6 +218,17 @@ export function createZeroServerBindings<
     authData: AuthData | null
     ctx: Parameters<ZeroServerMutatorRegistry<Schema>[string]>[0]['ctx']
   }>()
+  const executeAction = options.actions
+    ? (options.actions.dispatchRemote ?? options.actions.execute)
+    : null
+  const enqueueTask: NonNullable<MutatorContext['server']>['enqueueTask'] = (
+    task,
+    taskOptions
+  ) => {
+    const current = invocation.get()
+    if (!current) throw new Error('on-zero task scheduled outside a server mutation')
+    current.ctx.defer(() => runWithAuthScope(current.authData, task), taskOptions)
+  }
   const decoratedMutators = createMutators({
     authData: null,
     can: permissions.can,
@@ -223,10 +246,12 @@ export function createZeroServerBindings<
         }
       : undefined,
     resolveAuthData: () => invocation.get()?.authData ?? null,
-    enqueueTask(task, taskOptions) {
-      const current = invocation.get()
-      if (!current) throw new Error('on-zero task scheduled outside a server mutation')
-      current.ctx.defer(() => runWithAuthScope(current.authData, task), taskOptions)
+    enqueueTask,
+    enqueueAction(action, actionOptions) {
+      if (!executeAction) {
+        throw new Error(`on-zero async actions are not configured`)
+      }
+      enqueueTask(() => Promise.resolve(executeAction(action as Action)), actionOptions)
     },
   }) as Record<string, Record<string, (tx: Transaction, args: unknown) => Promise<void>>>
 
@@ -239,7 +264,7 @@ export function createZeroServerBindings<
           throw new Error(`unknown on-zero mutator: ${modelName}|${mutatorName}`)
         try {
           await invocation.run({ authData, ctx }, () =>
-            mutation(tx as unknown as Transaction, args),
+            mutation(tx as unknown as Transaction, args)
           )
         } catch (error) {
           const name = (error as { name?: unknown })?.name
@@ -255,11 +280,10 @@ export function createZeroServerBindings<
     // freezing the registry makes the server seam immutable without importing
     // any particular executor implementation.
     mutators: Object.freeze({ ...registry }),
-    async resolveQuery(name, args, claims) {
+    async resolveQuery(name, args, authData) {
       if (!options.queries) {
         throw new Error('No queries registered with createZeroServerBindings.')
       }
-      const authData = mapClaims(claims)
       const query = await runWithQueryContext({ authData }, () =>
         resolveServerQuery({
           authData,
@@ -268,7 +292,7 @@ export function createZeroServerBindings<
           queries: options.queries!,
           permissions,
           validateQuery: options.validateQuery,
-        }),
+        })
       )
       return asQueryInternals(query as never).ast as JsonValue
     },
@@ -295,18 +319,19 @@ export function createZeroServerBindings<
               schema: options.schema,
               request,
               userID,
-            }),
+            })
       )
     },
     server(executor) {
       const transaction = <Value>(
-        claims: NormalizedClaims,
-        work: (tx: Transaction) => Value | Promise<Value>,
-      ) => executor.transaction(claims, (tx) => work(tx as unknown as Transaction))
+        authData: AuthData | null,
+        work: (tx: Transaction) => Value | Promise<Value>
+      ) =>
+        executor.transaction(authToClaims(authData), (tx) =>
+          work(tx as unknown as Transaction)
+        )
 
-      setRunner((query) =>
-        transaction({ userID: 'server' }, (tx) => tx.run(query as never)),
-      )
+      setRunner((query) => transaction(null, (tx) => tx.run(query as never)))
 
       const mutate = new Proxy({} as ServerMutate<Models>, {
         get(_target, modelName: string) {
@@ -319,7 +344,7 @@ export function createZeroServerBindings<
                   typeof handler === 'function' && handler.length > 1
                 return (
                   argsOrOptions: JsonValue | MutateOptions,
-                  optionsForArgument?: MutateOptions,
+                  optionsForArgument?: MutateOptions
                 ) => {
                   const args = acceptsArgument ? (argsOrOptions as JsonValue) : null
                   const mutateOptions = acceptsArgument
@@ -330,7 +355,7 @@ export function createZeroServerBindings<
                   return executor.execute(`${modelName}|${mutatorName}`, args, claims)
                 }
               },
-            },
+            }
           )
         },
       })
@@ -339,11 +364,13 @@ export function createZeroServerBindings<
         mutate,
         transaction,
         query<Result>(
-          claims: NormalizedClaims,
-          work: (q: QueryBuilder) => Query<any, Schema, Result>,
+          authData: AuthData | null,
+          work: (q: QueryBuilder) => Query<any, Schema, Result>
         ) {
-          return runWithQueryContext({ authData: mapClaims(claims) }, () =>
-            executor.query(claims, (tx) => tx.run(work(getZQL()) as never)),
+          return runWithQueryContext({ authData }, () =>
+            executor.query(authToClaims(authData), (tx) =>
+              tx.run(work(getZQL()) as never)
+            )
           ) as Promise<HumanReadable<Result>>
         },
       }
@@ -378,7 +405,7 @@ function resolveServerQuery({
     try {
       return (getZQL() as any)[table]
         .where((eb: any) =>
-          permissions.buildPermissionQuery(authData, eb, permission, objOrId, table),
+          permissions.buildPermissionQuery(authData, eb, permission, objOrId, table)
         )
         .one()
     } finally {
@@ -396,9 +423,9 @@ function resolveServerQuery({
 // authData and walk straight through `ensure(authData)` guards.
 const AUTH_CLAIM = 'authData'
 
-export function authDataToClaims(
+function authDataToClaims(
   authData: AuthData | null | undefined,
-  anonymousUserID = 'anon',
+  anonymousUserID = 'anon'
 ): NormalizedClaims {
   const userID = typeof authData?.id === 'string' ? authData.id : anonymousUserID
   const claims: Record<string, JsonValue> = { userID }

package/src/serverWhere.ts

@@ -5,7 +5,7 @@ import type { Condition } from '@rocicorp/zero'
 
 export function serverWhere<Table extends TableName, Builder extends Where<Table>>(
   tableName: Table,
-  builder: Builder,
+  builder: Builder
 ): Where<Table, Condition>
 
 export function serverWhere<
@@ -15,7 +15,7 @@ export function serverWhere<
 
 export function serverWhere<Table extends TableName, Builder extends Where<Table>>(
   a: Table | Builder,
-  b?: Builder,
+  b?: Builder
 ): Where<Table, any> | Builder {
   return where(a as any, b as any, true)
 }

package/src/state.ts

@@ -1,7 +1,7 @@
-import type { Schema, SchemaQuery } from '@rocicorp/zero'
-import { globalValue } from '@take-out/helpers'
+import { globalValue } from './helpers/globalValue'
 
 import type { AuthData, QueryBuilder } from './types'
+import type { Schema, SchemaQuery } from '@rocicorp/zero'
 
 type State = {
   schema: Schema | null

package/src/types.ts

@@ -1,3 +1,5 @@
+import type { NullToOptional } from './helpers/NullToOptional'
+import type { TupleToUnion } from './helpers/tuple'
 import type {
   Condition,
   ExpressionBuilder,
@@ -7,7 +9,6 @@ import type {
   Schema as ZeroSchema,
   Transaction as ZeroTransaction,
 } from '@rocicorp/zero'
-import type { NullToOptional, TupleToUnion } from '@take-out/helpers'
 
 /**
  * ➗0️⃣ START OVERRIDDEN TYPES
@@ -35,6 +36,7 @@ interface DefaultConfig {
   schema: ZeroSchema
   authData: {}
   serverActions: null
+  asyncAction: never
 }
 
 interface FinalConfig extends Omit<DefaultConfig, keyof Config>, Config {}
@@ -58,6 +60,15 @@ export type ServerActions =
     ? FinalConfig['serverActions']
     : Record<string, unknown>
 
+export type AsyncActionEnvelope = {
+  readonly type: string
+  readonly [field: string]: unknown
+}
+
+export type AsyncAction = FinalConfig['asyncAction'] extends AsyncActionEnvelope
+  ? FinalConfig['asyncAction']
+  : never
+
 export type QueryBuilder = SchemaQuery<Schema>
 
 export type AsyncTask = () => Promise<void>
@@ -87,6 +98,7 @@ export type MutatorContext = {
      * through a new instance. Barrier tasks finish before the push response.
      */
     enqueueTask(task: AsyncTask, opts?: AsyncTaskOptions): void
+    enqueueAction(action: AsyncAction, opts?: AsyncTaskOptions): void
   }
   can: Can
 }
@@ -119,12 +131,12 @@ export type Where<
   ReturnType extends Condition | boolean = Condition | boolean,
 > = (
   expressionBuilder: ExpressionBuilder<Table, Schema>,
-  auth?: AuthData | null,
+  auth?: AuthData | null
 ) => ReturnType
 
 export type Can = <PWhere extends Where>(
   where: PWhere,
-  obj: string | Record<string, unknown>,
+  obj: string | Record<string, unknown>
 ) => Promise<void>
 
 type GenericTable = TableBuilderWithColumns<any>
@@ -149,11 +161,40 @@ export type TablePrimaryKeys<TS extends GenericTable> = TupleToUnion<
 >
 
 export type ZeroEvent =
-  | { type: 'error'; message: string }
+  | {
+      type: 'error'
+      reasonKey: 'connection-error' | 'connection-needs-auth'
+      message: string
+    }
   // recovery lifecycle: 'recovering' = dropping local state + reloading;
   // 'fatal' = recovery already attempted (loop guard tripped), not reloading.
-  | { type: 'recovering'; reason: string }
-  | { type: 'fatal'; reason: string }
+  | { type: 'recovering'; reasonKey: ZeroRecoveryReasonKey; reason: string }
+  | { type: 'fatal'; reasonKey: ZeroRecoveryReasonKey; reason: string }
+
+export type ZeroEventsEmitter = {
+  value: ZeroEvent | null
+  options?: {
+    name: string
+    silent?: boolean
+    comparator?: (a: ZeroEvent | null, b: ZeroEvent | null) => boolean
+  }
+  listen: (listener: (value: ZeroEvent | null) => void) => () => void
+  emit: (next: ZeroEvent | null) => void
+}
+
+export type ZeroRecoveryReasonKey =
+  | 'NewClientGroup'
+  | 'VersionNotSupported'
+  | 'SchemaVersionNotSupported'
+  | 'client-state-not-found'
+  | 'indexeddb-not-found'
+  | 'sqlite-statement-finalized'
+  | 'store-closed-repeat'
+  | 'mutation-desync'
+  | 'connection-cookie-invalid'
+  | 'client-not-found'
+  | 'connection-userid-mismatch'
+  | 'server-ack-timeout'
 
 /**
  * Admin role bypass for permissions:

package/src/useQuery.empty.test.tsx

@@ -8,12 +8,12 @@
 
 import { createSchema, number, string, table } from '@rocicorp/zero'
 import { useQuery as useRawZeroQuery } from '@rocicorp/zero/react'
-import { IS_SERVER, IS_SERVER_RUNTIME } from '@take-out/helpers'
 import { act } from 'react'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, expect, test } from 'vitest'
 
 import { createZeroClient } from './createZeroClient'
+import { IS_SERVER, IS_SERVER_RUNTIME } from './helpers/platform'
 import { zql } from './zql'
 
 declare global {
@@ -32,7 +32,7 @@ const schema = createSchema({ tables: [todoTable] })
 const allTodos = (_args: void) =>
   (zql as unknown as { todo: { orderBy: (k: string, d: string) => any } }).todo.orderBy(
     'createdAt',
-    'desc',
+    'desc'
   )
 const oneTodo = (args: { id: string }) =>
   (zql as unknown as { todo: { where: (k: string, v: string) => any } }).todo
@@ -73,7 +73,7 @@ function renderWithDisabled<T>(useHook: () => T): T {
     root.render(
       <client.ProvideZero authData={{}} userID="anon" disable>
         <Probe />
-      </client.ProvideZero>,
+      </client.ProvideZero>
     )
   })
   if (captured === undefined) throw new Error('Probe did not render')

package/src/useQuery.ssr.test.ts

@@ -29,7 +29,7 @@ const schema = createSchema({ tables: [todoTable] })
 const allTodos = (_args: void) =>
   (zql as unknown as { todo: { orderBy: (k: string, d: string) => any } }).todo.orderBy(
     'createdAt',
-    'desc',
+    'desc'
   )
 const oneTodo = (args: { id: string }) =>
   (zql as unknown as { todo: { where: (k: string, v: string) => any } }).todo

package/src/vite-plugin.ts

@@ -13,8 +13,9 @@ export interface OnZeroPluginOptions extends Omit<GenerateOptions, 'dir' | 'sile
   disableGenerate?: boolean
 }
 
-function createOnZeroHmrPlugin(hmrInclude: string[] = []): Plugin {
-  const hmrPaths = ['/mutations/', '/models/', '/generated/', '/queries/', ...hmrInclude]
+function createOnZeroHmrPlugin(hmrInclude: string[] = [], dataDir = 'src/data'): Plugin {
+  const normalizedDataDir = `/${dataDir.replaceAll('\\', '/').replace(/^\/+|\/+$/g, '')}/`
+  const hmrPaths = [normalizedDataDir, ...hmrInclude]
 
   return {
     name: 'on-zero:hmr',
@@ -30,7 +31,7 @@ function createOnZeroHmrPlugin(hmrInclude: string[] = []): Plugin {
       if (code.includes('import.meta.hot.invalidate')) {
         transformed = transformed.replace(
           /if\s*\(invalidateMessage\)\s*import\.meta\.hot\.invalidate\(invalidateMessage\);?/g,
-          '/* on-zero: HMR invalidate disabled */',
+          '/* on-zero: HMR invalidate disabled */'
         )
       }
 
@@ -54,8 +55,7 @@ export function onZeroPlugin(options: OnZeroPluginOptions = {}): Plugin[] {
   const dir = options.dir ?? 'src/data'
 
   let dataDir: string
-  let modelsDir: string
-  let queriesDir: string
+  let databaseDir: string
 
   const runGenerate = (silent: boolean) =>
     generate({
@@ -72,8 +72,7 @@ export function onZeroPlugin(options: OnZeroPluginOptions = {}): Plugin[] {
 
       configResolved(config) {
         dataDir = resolve(config.root, dir)
-        modelsDir = resolve(dataDir, 'models')
-        queriesDir = resolve(dataDir, 'queries')
+        databaseDir = resolve(dataDir, '../database')
       },
 
       async buildStart() {
@@ -85,7 +84,11 @@ export function onZeroPlugin(options: OnZeroPluginOptions = {}): Plugin[] {
 
         const handler = async (file: string) => {
           if (!/\.tsx?$/.test(file)) return
-          if (isWithinDirectory(file, modelsDir) || isWithinDirectory(file, queriesDir)) {
+          if (
+            (isWithinDirectory(file, dataDir) &&
+              !isWithinDirectory(file, resolve(dataDir, 'generated'))) ||
+            isWithinDirectory(file, databaseDir)
+          ) {
             await runGenerate(false)
           }
         }
@@ -109,7 +112,7 @@ export function onZeroPlugin(options: OnZeroPluginOptions = {}): Plugin[] {
       },
     },
 
-    createOnZeroHmrPlugin(options.hmrInclude),
+    createOnZeroHmrPlugin(options.hmrInclude, dir),
   ]
 }
 

package/src/where.ts

@@ -1,6 +1,5 @@
-import { globalValue } from '@take-out/helpers'
-
 import { getAuth } from './helpers/getAuth'
+import { globalValue } from './helpers/globalValue'
 import { getEnvironment } from './state'
 
 import type { TableName, Where } from './types'
@@ -17,17 +16,17 @@ export function setEvaluatingPermission(value: boolean) {
 export function where<Table extends TableName, Builder extends Where<Table>>(
   tableName: Table,
   builder: Builder,
-  isServerOnly?: boolean,
+  isServerOnly?: boolean
 ): Where<Table, Condition>
 
 export function where<Table extends TableName, Builder extends Where = Where<Table>>(
-  builder: Builder,
+  builder: Builder
 ): Where<Table, Condition>
 
 export function where<Table extends TableName, Builder extends Where<Table>>(
   a: Table | Builder,
   b?: Builder,
-  isServerOnly = false,
+  isServerOnly = false
 ): Where<Table, any> | Builder {
   const whereFn = (b || a) as any
 
@@ -62,12 +61,12 @@ export function where<Table extends TableName, Builder extends Where<Table>>(
 
 const WhereTableNameMap = globalValue(
   `on-zero:where-name`,
-  () => new WeakMap<Where, TableName>(),
+  () => new WeakMap<Where, TableName>()
 )
 
 const WhereRawBuilderMap = globalValue(
   `on-zero:where-raw`,
-  () => new WeakMap<Where, Where>(),
+  () => new WeakMap<Where, Where>()
 )
 
 export function getWhereTableName(where: Where) {

package/src/zeroRunner.ts

@@ -11,7 +11,7 @@ export type { RunOptions }
 
 export type ZeroRunner = <TReturn>(
   query: Query<any, ZeroSchema, TReturn>,
-  options?: RunOptions,
+  options?: RunOptions
 ) => Promise<HumanReadable<TReturn>>
 
 let runner: ZeroRunner | null = null
@@ -37,7 +37,7 @@ export function getAmbientRunner(instance?: { runner: ZeroRunner | null }): Zero
 
   if (!runner) {
     throw new Error(
-      'Zero runner not initialized. Ensure ProvideZero is mounted or server bindings are active.',
+      'Zero runner not initialized. Ensure ProvideZero is mounted or server bindings are active.'
     )
   }
 

package/types/combineZeroClients.d.ts

@@ -1,6 +1,5 @@
-import { type Emitter } from '@take-out/helpers';
 import { run } from './run';
-import type { ZeroEvent } from './types';
+import type { ZeroEventsEmitter } from './types';
 import type { ReactNode } from 'react';
 type ControlQueriesProps = {
     children: ReactNode;
@@ -16,21 +15,28 @@ type CombinableZeroClient = {
     zero: any;
     preload: (...args: any[]) => any;
     getQuery: (...args: any[]) => any;
-    zeroEvents: Emitter<ZeroEvent | null>;
+    zeroEvents: ZeroEventsEmitter;
     ControlQueries: (props: ControlQueriesProps) => ReactNode;
 };
 export type CombineZeroClientsOptions = {
     inner?: string;
 };
 type UnionToIntersection<U> = (U extends any ? (x: U) => void : never) extends (x: infer I) => void ? I : never;
+type WithoutMutate<Zero> = Zero extends unknown ? Omit<Zero, 'mutate'> : never;
+type MutationsOf<Zero> = Zero extends {
+    mutate: infer Mutations;
+} ? Mutations : never;
+type CombinedZero<Clients extends readonly CombinableZeroClient[]> = UnionToIntersection<WithoutMutate<Clients[number]['zero']>> & {
+    mutate: UnionToIntersection<MutationsOf<Clients[number]['zero']>>;
+};
 export type CombinedZeroClients<Clients extends readonly CombinableZeroClient[]> = {
     useQuery: UnionToIntersection<Clients[number]['useQuery']>;
     usePermission: UnionToIntersection<Clients[number]['usePermission']>;
-    zero: UnionToIntersection<Clients[number]['zero']>;
+    zero: CombinedZero<Clients>;
     preload: UnionToIntersection<Clients[number]['preload']>;
     getQuery: UnionToIntersection<Clients[number]['getQuery']>;
     run: typeof run;
-    zeroEvents: Emitter<ZeroEvent | null>;
+    zeroEvents: ZeroEventsEmitter;
     ControlQueries: (props: ControlQueriesProps) => ReactNode;
 };
 export declare function combineZeroClients<const Clients extends readonly [CombinableZeroClient, ...CombinableZeroClient[]]>(...clientsAndOptions: [...Clients] | [...Clients, CombineZeroClientsOptions]): CombinedZeroClients<Clients>;

package/types/combineZeroClients.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"combineZeroClients.d.ts","sourceRoot":"","sources":["../src/combineZeroClients.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAG/D,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAA;AAE3B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAoBtC,KAAK,mBAAmB,GAAG;IACzB,QAAQ,EAAE,SAAS,CAAA;IACnB,MAAM,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAA;IAC7B,YAAY,CAAC,EAAE,OAAO,GAAG,YAAY,CAAA;CACtC,CAAA;AAID,KAAK,oBAAoB,GAAG;IAC1B,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAA;IACjC,cAAc,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAA;IACvC,aAAa,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAA;IACtC,mBAAmB,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAA;IAC5C,IAAI,EAAE,GAAG,CAAA;IACT,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAA;IAChC,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAA;IACjC,UAAU,EAAE,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAAA;IACrC,cAAc,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,SAAS,CAAA;CAC1D,CAAA;AAED,MAAM,MAAM,yBAAyB,GAAG;IAGtC,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,KAAK,mBAAmB,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI,GAAG,KAAK,CAAC,SAAS,CAC7E,CAAC,EAAE,MAAM,CAAC,KACP,IAAI,GACL,CAAC,GACD,KAAK,CAAA;AAET,MAAM,MAAM,mBAAmB,CAAC,OAAO,SAAS,SAAS,oBAAoB,EAAE,IAAI;IACjF,QAAQ,EAAE,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC,CAAA;IAC1D,aAAa,EAAE,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAA;IACpE,IAAI,EAAE,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;IAClD,OAAO,EAAE,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,CAAA;IACxD,QAAQ,EAAE,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC,CAAA;IAC1D,GAAG,EAAE,OAAO,GAAG,CAAA;IACf,UAAU,EAAE,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAAA;IACrC,cAAc,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,SAAS,CAAA;CAC1D,CAAA;AAED,wBAAgB,kBAAkB,CAChC,KAAK,CAAC,OAAO,SAAS,SAAS,CAAC,oBAAoB,EAAE,GAAG,oBAAoB,EAAE,CAAC,EAEhF,GAAG,iBAAiB,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,EAAE,yBAAyB,CAAC,GAC3E,mBAAmB,CAAC,OAAO,CAAC,CA6G9B"}
+{"version":3,"file":"combineZeroClients.d.ts","sourceRoot":"","sources":["../src/combineZeroClients.tsx"],"names":[],"mappings":"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"}