on-zero 0.6.21 → 0.6.22-1784492767691

package/src/createZeroSQLiteServer.test.ts

@@ -6,6 +6,8 @@ import { afterEach, beforeEach, describe, expect, test } from 'vitest'
 
 import { createZeroSQLiteServer } from './createZeroSQLiteServer'
 import { zeroHttpFixtureSchema } from './httpPull/fixtureSchema'
+import { mutations } from './mutations'
+import { serverWhere } from './serverWhere'
 
 import type {
   SqlStatementMetadata,
@@ -290,6 +292,98 @@ describe('createZeroSQLiteServer', () => {
     })
   })
 
+  test('allows a custom CRUD mutation to no-op without an automatic permission check', async () => {
+    const projectPermission = serverWhere('project', (q) => q.cmp('ownerId', 'u1'))
+    const projectMutations = mutations('project', projectPermission, {
+      insert: async () => {},
+    })
+    const server = createZeroSQLiteServer({
+      schema: zeroHttpFixtureSchema,
+      models: {
+        project: { mutate: projectMutations },
+      },
+      createServerActions: () => ({}),
+      transactionProvider,
+    })
+
+    const result = await server.handleMutationRequest({
+      authData: { id: 'u1', role: 'user' },
+      request: pushRequest(1, 'project.insert', {
+        id: 'p1',
+        ownerId: 'u1',
+        name: 'skip',
+      }),
+    })
+
+    expect((result.response as any).mutations[0].result).toEqual({})
+    expect(db.prepare('SELECT * FROM project').all()).toEqual([])
+  })
+
+  test('rolls back when a custom CRUD mutation throws', async () => {
+    const projectPermission = serverWhere('project', (q) => q.cmp('ownerId', 'u1'))
+    const projectMutations = mutations('project', projectPermission, {
+      insert: async ({ tx }, value: { id: string; ownerId: string; name: string }) => {
+        await tx.mutate.project.insert(value)
+        throw new Error('denied by custom validation')
+      },
+    })
+    const server = createZeroSQLiteServer({
+      schema: zeroHttpFixtureSchema,
+      models: {
+        project: { mutate: projectMutations },
+      },
+      createServerActions: () => ({}),
+      transactionProvider,
+    })
+
+    const result = await server.handleMutationRequest({
+      authData: { id: 'u2', role: 'user' },
+      request: pushRequest(1, 'project.insert', {
+        id: 'p2',
+        ownerId: 'u2',
+        name: 'unauthorized',
+      }),
+    })
+
+    expect((result.response as any).mutations[0].result).toMatchObject({
+      error: 'app',
+      message: 'denied by custom validation',
+    })
+    expect(db.prepare('SELECT * FROM project').all()).toEqual([])
+  })
+
+  test('permission-checks generated CRUD mutations', async () => {
+    let inserted: Record<string, unknown> | undefined
+    let permissionChecks = 0
+    const projectPermission = serverWhere('project', (q) => q.cmp('ownerId', 'u1'))
+    const projectMutations = mutations('project', projectPermission)
+    const value = { id: 'p3', ownerId: 'u2', name: 'unauthorized' }
+
+    await expect(
+      projectMutations.insert(
+        {
+          tx: {
+            mutate: {
+              project: {
+                insert: async (row: Record<string, unknown>) => {
+                  inserted = row
+                },
+              },
+            },
+          },
+          can: async (_where, row) => {
+            permissionChecks++
+            expect(row).toEqual(value)
+            throw new Error('denied')
+          },
+        } as never,
+        value,
+      ),
+    ).rejects.toThrow('denied')
+    expect(inserted).toEqual(value)
+    expect(permissionChecks).toBe(1)
+  })
+
   test('recovers duplicate results and deletes them through the cleanup mutation', async () => {
     const server = createZeroSQLiteServer({
       schema: zeroHttpFixtureSchema,

package/src/httpPull/transport.test.ts

@@ -205,10 +205,11 @@ describe('zero-http transport', () => {
     expect(requests.at(-1)?.headers.authorization).toBe('Bearer token-new')
   })
 
-  test('push frames are serialized per socket', async () => {
+  test('push frames are serialized and queued bursts are batched per socket', async () => {
     const firstPushStarted = defer<void>()
     const releaseFirstPush = defer<void>()
-    const pushIDs: number[] = []
+    const pushRequests: number[][] = []
+    const lifecycle: HttpPullLifecycleEvent[] = []
     const fetch = vi.fn(async (input: RequestInfo | URL, init?: RequestInit) => {
       const request = recordRequest(input, init)
       if (request.path === '/pull') {
@@ -216,9 +217,9 @@ describe('zero-http transport', () => {
       }
 
       expect(request.path).toBe('/push')
-      const mutationID = request.body.mutations[0].id
-      pushIDs.push(mutationID)
-      if (mutationID === 1) {
+      const mutationIDs = request.body.mutations.map((mutation: any) => mutation.id)
+      pushRequests.push(mutationIDs)
+      if (mutationIDs[0] === 1) {
         firstPushStarted.resolve()
         await releaseFirstPush.promise
       }
@@ -231,7 +232,12 @@ describe('zero-http transport', () => {
         },
       })
     })
-    install(fetch)
+    const transport = installHttpPullTransport({
+      origin: ORIGIN,
+      fetch,
+      lifecycle: (event) => lifecycle.push(event),
+    })
+    transports.push(transport)
     const { messages, socket } = openRawSocketWithMessages()
 
     await eventually(() =>
@@ -240,19 +246,34 @@ describe('zero-http transport', () => {
     socket.send(JSON.stringify(['push', pushBody(1)]))
     await firstPushStarted.promise
     socket.send(JSON.stringify(['push', pushBody(2)]))
+    socket.send(JSON.stringify(['push', pushBody(3)]))
+    socket.send(JSON.stringify(['push', pushBody(4)]))
     await sleep(25)
 
-    expect(pushIDs).toEqual([1])
+    expect(pushRequests).toEqual([[1]])
     releaseFirstPush.resolve()
-    await eventually(() => expect(pushIDs).toEqual([1, 2]))
+    await eventually(() => expect(pushRequests).toEqual([[1], [2, 3, 4]]))
     await eventually(() =>
       expect(messages.filter((message) => message[0] === 'pushResponse')).toHaveLength(2),
     )
     expect(
       messages
         .filter((message) => message[0] === 'pushResponse')
-        .map((message) => message[1].mutations[0].id.id),
-    ).toEqual([1, 2])
+        .flatMap((message) =>
+          message[1].mutations.map((mutation: any) => mutation.id.id),
+        ),
+    ).toEqual([1, 2, 3, 4])
+    expect(
+      lifecycle
+        .filter((event) => event.type === 'push')
+        .map(({ pushFrameCount, mutationCount }) => ({
+          pushFrameCount,
+          mutationCount,
+        })),
+    ).toEqual([
+      { pushFrameCount: 1, mutationCount: 1 },
+      { pushFrameCount: 3, mutationCount: 3 },
+    ])
   })
 
   test('cookie discipline skips unchanged pokes, chains changed pokes, and coalesces concurrent pulls', async () => {

package/src/httpPullTransport.ts

@@ -2,7 +2,7 @@
 // by intercepting its /sync/v51/connect WebSocket with a shim that translates
 // pull responses into v51 pokes. ported from the orez zero-http spike — the
 // wire contract (lexicographic string cookies, gotQueriesPatch poke-part
-// ordering, FIFO push serialization, updateAuth, 401→Unauthorized frame,
+// ordering, bounded FIFO push batching, updateAuth, 401→Unauthorized frame,
 // teardown drain) is pinned by the tests in ./httpPull/ and documented in
 // ~/orez/plans/zero-http.md. do not "simplify" any of it without re-running
 // those tests against a stock zero client.
@@ -57,6 +57,16 @@ type PullResponse =
       gotQueries?: ServerGotQueries
     }
 
+type PushBody = Record<string, unknown> & {
+  mutations: unknown[]
+}
+
+type PushBatch = {
+  body: unknown
+  frameCount: number
+  mutationCount: number
+}
+
 type TransportState = {
   readonly pageID: string
   readonly transportID: string
@@ -80,6 +90,11 @@ type TransportState = {
 }
 
 const COOKIE_WIDTH = 20
+// the stock zero-cache pusher drains queued frames into a single request once
+// its current request completes. keep the same backpressure relief here, but
+// cap the number of mutations so one response cannot monopolize the HTTP
+// transport indefinitely under a sustained producer.
+const MAX_PUSH_BATCH_MUTATIONS = 64
 // @rocicorp/zero 1.6 starts this deadline before its async createSocket work.
 // the connect URL's `ts` is captured at the same attempt boundary.
 const ZERO_CONNECT_TIMEOUT_MS = 10_000
@@ -122,7 +137,15 @@ export type HttpPullTransportOptions = {
 }
 
 export type HttpPullLifecycleEvent = {
-  type: 'created' | 'listener' | 'open' | 'close' | 'failure' | 'superseded' | 'aborted'
+  type:
+    | 'created'
+    | 'listener'
+    | 'open'
+    | 'close'
+    | 'failure'
+    | 'superseded'
+    | 'aborted'
+    | 'push'
   pageID: string
   transportID: string
   zeroInstanceID: string
@@ -139,6 +162,8 @@ export type HttpPullLifecycleEvent = {
   listener?: SocketEventType
   code?: number
   reason?: string
+  pushFrameCount?: number
+  mutationCount?: number
 }
 
 type HttpPullPageRegistry = {
@@ -307,7 +332,8 @@ class ZeroHttpSocket {
   private sentQueryPatchLen = 0
   private pullInFlight: Promise<void> | undefined
   private pullAfterCurrent = false
-  private pushChain: Promise<void> = Promise.resolve()
+  private pendingPushes: unknown[] = []
+  private pushInFlight = false
   private nextLocalCookieID: number
   private openTimer: ReturnType<typeof setTimeout> | undefined
   private pullTimer: ReturnType<typeof setInterval> | undefined
@@ -565,10 +591,14 @@ class ZeroHttpSocket {
     this.queryVersion++
   }
 
-  private async push(body: unknown) {
+  private async push({ body, frameCount, mutationCount }: PushBatch) {
     const response = (await this.postJSON('/push', body)) as {
       pushResponse?: unknown
     }
+    this.emitLifecycle('push', {
+      pushFrameCount: frameCount,
+      mutationCount,
+    })
     // mutation RECOVERY pushes carry a PREVIOUS client's pending mutations,
     // and the server response echoes that old clientID. zero-cache's pusher
     // groups results by clientID and only delivers a client its OWN results
@@ -583,12 +613,50 @@ class ZeroHttpSocket {
   }
 
   private enqueuePush(body: unknown) {
-    const nextPush = this.pushChain.then(async () => {
-      if (this.readyState === this.CLOSED) return
-      await this.push(body)
-    })
-    this.pushChain = nextPush.catch(() => {})
-    this.run(nextPush)
+    this.pendingPushes.push(body)
+    if (this.pushInFlight) return
+    this.run(this.drainPushes())
+  }
+
+  private async drainPushes() {
+    this.pushInFlight = true
+    try {
+      while (this.readyState !== this.CLOSED && this.pendingPushes.length > 0) {
+        await this.push(this.takePushBatch())
+      }
+    } finally {
+      this.pushInFlight = false
+    }
+  }
+
+  private takePushBatch(): PushBatch {
+    const first = this.pendingPushes.shift()
+    const firstBody = parsePushBody(first)
+    if (!firstBody) {
+      return { body: first, frameCount: 1, mutationCount: 0 }
+    }
+
+    const mutations = [...firstBody.mutations]
+    let frameCount = 1
+    while (this.pendingPushes.length > 0) {
+      const nextBody = parsePushBody(this.pendingPushes[0])
+      if (
+        !nextBody ||
+        !areCompatiblePushBodies(firstBody, nextBody) ||
+        mutations.length + nextBody.mutations.length > MAX_PUSH_BATCH_MUTATIONS
+      ) {
+        break
+      }
+      this.pendingPushes.shift()
+      mutations.push(...nextBody.mutations)
+      frameCount++
+    }
+
+    return {
+      body: frameCount === 1 ? firstBody : { ...firstBody, mutations },
+      frameCount,
+      mutationCount: mutations.length,
+    }
   }
 
   private requestPullAfterCurrent() {
@@ -849,7 +917,10 @@ class ZeroHttpSocket {
 
   private emitLifecycle(
     type: HttpPullLifecycleEvent['type'],
-    detail: Pick<HttpPullLifecycleEvent, 'listener' | 'code' | 'reason'> = {},
+    detail: Pick<
+      HttpPullLifecycleEvent,
+      'listener' | 'code' | 'reason' | 'pushFrameCount' | 'mutationCount'
+    > = {},
   ) {
     this.state.lifecycle?.({
       type,
@@ -872,6 +943,21 @@ class ZeroHttpSocket {
   }
 }
 
+function parsePushBody(value: unknown): PushBody | undefined {
+  if (typeof value !== 'object' || value === null || Array.isArray(value)) return
+  if (!('mutations' in value) || !Array.isArray(value.mutations)) return
+  // the runtime checks above establish the only fields batching reads.
+  return value as PushBody
+}
+
+function areCompatiblePushBodies(left: PushBody, right: PushBody) {
+  return (
+    left.clientGroupID === right.clientGroupID &&
+    left.pushVersion === right.pushVersion &&
+    left.schemaVersion === right.schemaVersion
+  )
+}
+
 function shouldIntercept(origin: URL, url: string | URL) {
   const candidate = toHttpURL(url)
   if (candidate.origin !== origin.origin) return false

package/src/mutations.ts

@@ -1,7 +1,7 @@
 import { IS_SERVER_RUNTIME } from '@take-out/helpers'
-import { getDidRunPermissionCheck } from './helpers/didRunPermissionCheck'
 import { setMutationsPermissions } from './modelRegistry'
 
+import type { TableBuilderWithColumns } from '@rocicorp/zero'
 import type {
   MutatorContext,
   Schema,
@@ -10,7 +10,6 @@ import type {
   TableUpdateRow,
   Where,
 } from './types'
-import type { TableBuilderWithColumns } from '@rocicorp/zero'
 
 // derive a TableBuilderWithColumns from the global schema by table name
 type SchemaTableBuilder<TName extends TableName> = TableBuilderWithColumns<
@@ -74,10 +73,6 @@ function getOrCreateMutationProxy<T extends Record<string, Function>>(
   return proxy
 }
 
-// two ways to use it:
-//  - mutations({}) which doesn't add the "allowed" helper or add CRUD
-//  - mutation('tableName', permissions) adds CRUD with permissions, adds allowed
-
 type MutationBuilder<Obj = any> = (ctx: MutatorContext, obj?: Obj) => Promise<void>
 type MutationBuilders = Record<string, MutationBuilder>
 
@@ -158,6 +153,9 @@ export function mutations<
         : ((table as Table).schema.name as TableName)
 
     const createCRUDMutation = (action: CRUDNames) => {
+      const customMutation = mutations?.[action]
+      if (customMutation) return customMutation
+
       return async (ctx: MutatorContext, obj: any) => {
         /**
          * CRUD mutations have permissions handled automatically using `can`:
@@ -168,11 +166,6 @@ export function mutations<
          *   - for the rest: check runs before mutation
          */
         const runServerPermissionCheck = async () => {
-          if (getDidRunPermissionCheck(ctx)) {
-            // if the user-defined CRUD mutation runs their own "can", we avoid running ours
-            return
-          }
-
           // only validate on the server
           if (IS_SERVER_RUNTIME) {
             await ctx.can(permissions, obj)
@@ -183,15 +176,8 @@ export function mutations<
           await runServerPermissionCheck()
         }
 
-        // if user defines insert run theirs, if not run plain zero:
-        const existing = mutations?.[action]
-
-        if (existing) {
-          await existing(ctx, obj)
-        } else {
-          type TableName = keyof typeof ctx.tx.mutate // weird type foo because we declare this module and then type check
-          await ctx.tx.mutate[tableName as TableName]![action](obj)
-        }
+        type TableName = keyof typeof ctx.tx.mutate // weird type foo because we declare this module and then type check
+        await ctx.tx.mutate[tableName as TableName]![action](obj)
 
         if (action === 'insert' || action === 'upsert') {
           await runServerPermissionCheck()
@@ -208,7 +194,7 @@ export function mutations<
 
     const finalMutations = {
       ...mutations,
-      // overwrite regular mutations but call them if they are defined by user
+      // generated CRUD fills missing operations; custom CRUD runs as-is
       ...crudMutations,
     } as any as Mutations
 

package/types/createPermissions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createPermissions.d.ts","sourceRoot":"","sources":["../src/createPermissions.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAe,KAAK,EAAE,MAAM,SAAS,CAAA;AAC1F,OAAO,KAAK,EACV,SAAS,EACT,iBAAiB,EAEjB,MAAM,IAAI,UAAU,EACrB,MAAM,gBAAgB,CAAA;AAEvB,qBAAa,eAAgB,SAAQ,KAAK;gBAC5B,OAAO,EAAE,MAAM;CAI5B;AAED,wBAAgB,iBAAiB,CAAC,MAAM,SAAS,UAAU,EAAE,EAC3D,WAAW,EACX,MAAM,EACN,aAAqB,GACtB,EAAE;IACD,WAAW,EAAE,QAAQ,GAAG,QAAQ,CAAA;IAChC,MAAM,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,aAAa,CAAA;CAC9B;;2BAG+B,eAAe,kCACjC,QAAQ,GAAG,IAAI,MACrB,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,mBACd,eAAe,WAEvB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,sBACjB,SAAS;EAoHhC"}
+{"version":3,"file":"createPermissions.d.ts","sourceRoot":"","sources":["../src/createPermissions.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAe,KAAK,EAAE,MAAM,SAAS,CAAA;AAC1F,OAAO,KAAK,EACV,SAAS,EACT,iBAAiB,EAEjB,MAAM,IAAI,UAAU,EACrB,MAAM,gBAAgB,CAAA;AAEvB,qBAAa,eAAgB,SAAQ,KAAK;gBAC5B,OAAO,EAAE,MAAM;CAI5B;AAED,wBAAgB,iBAAiB,CAAC,MAAM,SAAS,UAAU,EAAE,EAC3D,WAAW,EACX,MAAM,EACN,aAAqB,GACtB,EAAE;IACD,WAAW,EAAE,QAAQ,GAAG,QAAQ,CAAA;IAChC,MAAM,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,aAAa,CAAA;CAC9B;;2BAG+B,eAAe,kCACjC,QAAQ,GAAG,IAAI,MACrB,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,mBACd,eAAe,WAEvB,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,sBACjB,SAAS;EAmHhC"}

package/types/httpPullTransport.d.ts

@@ -19,7 +19,7 @@ export type HttpPullTransportOptions = {
     lifecycle?: (event: HttpPullLifecycleEvent) => void;
 };
 export type HttpPullLifecycleEvent = {
-    type: 'created' | 'listener' | 'open' | 'close' | 'failure' | 'superseded' | 'aborted';
+    type: 'created' | 'listener' | 'open' | 'close' | 'failure' | 'superseded' | 'aborted' | 'push';
     pageID: string;
     transportID: string;
     zeroInstanceID: string;
@@ -36,6 +36,8 @@ export type HttpPullLifecycleEvent = {
     listener?: SocketEventType;
     code?: number;
     reason?: string;
+    pushFrameCount?: number;
+    mutationCount?: number;
 };
 export declare function installHttpPullTransport(opts: HttpPullTransportOptions): HttpPullTransport;
 export declare function ensureHttpPullTransport(opts: HttpPullTransportOptions): HttpPullTransport;

package/types/httpPullTransport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"httpPullTransport.d.ts","sourceRoot":"","sources":["../src/httpPullTransport.ts"],"names":[],"mappings":"AAUA,KAAK,eAAe,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,OAAO,CAAA;AA+B7D,MAAM,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,OAAO,EAAE,KAAK,OAAO,CAAA;AA6ChF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACrB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,SAAS,IAAI,IAAI,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,MAAM,EAAE,MAAM,CAAA;IAGd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,OAAO,KAAK,CAAA;IAGpB,cAAc,CAAC,EAAE,MAAM,CAAA;IAMvB,IAAI,CAAC,EAAE,OAAO,CAAA;IAId,cAAc,CAAC,EAAE,cAAc,CAAA;IAI/B,YAAY,CAAC,EAAE,OAAO,CAAA;IAGtB,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,CAAA;CACpD,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EAAE,SAAS,GAAG,UAAU,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,YAAY,GAAG,SAAS,CAAA;IACtF,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,MAAM,CAAA;IACnB,cAAc,EAAE,MAAM,CAAA;IACtB,aAAa,EAAE,MAAM,CAAA;IACrB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,gBAAgB,EAAE,MAAM,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAA;IACpC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAA;IAChC,QAAQ,CAAC,EAAE,eAAe,CAAA;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAwCD,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,wBAAwB,GAC7B,iBAAiB,CA6EnB;AAKD,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,wBAAwB,GAC7B,iBAAiB,CAQnB"}
+{"version":3,"file":"httpPullTransport.d.ts","sourceRoot":"","sources":["../src/httpPullTransport.ts"],"names":[],"mappings":"AAUA,KAAK,eAAe,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,GAAG,OAAO,CAAA;AA+B7D,MAAM,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,OAAO,EAAE,KAAK,OAAO,CAAA;AA4DhF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACrB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,SAAS,IAAI,IAAI,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,MAAM,EAAE,MAAM,CAAA;IAGd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,OAAO,KAAK,CAAA;IAGpB,cAAc,CAAC,EAAE,MAAM,CAAA;IAMvB,IAAI,CAAC,EAAE,OAAO,CAAA;IAId,cAAc,CAAC,EAAE,cAAc,CAAA;IAI/B,YAAY,CAAC,EAAE,OAAO,CAAA;IAGtB,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,CAAA;CACpD,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EACA,SAAS,GACT,UAAU,GACV,MAAM,GACN,OAAO,GACP,SAAS,GACT,YAAY,GACZ,SAAS,GACT,MAAM,CAAA;IACV,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,MAAM,CAAA;IACnB,cAAc,EAAE,MAAM,CAAA;IACtB,aAAa,EAAE,MAAM,CAAA;IACrB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,gBAAgB,EAAE,MAAM,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAA;IACpC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAA;IAChC,QAAQ,CAAC,EAAE,eAAe,CAAA;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,CAAA;AAwCD,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,wBAAwB,GAC7B,iBAAiB,CA6EnB;AAKD,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,wBAAwB,GAC7B,iBAAiB,CAQnB"}

package/types/mutations.d.ts

@@ -1,5 +1,5 @@
-import type { MutatorContext, Schema, TableInsertRow, TableName, TableUpdateRow, Where } from './types';
 import type { TableBuilderWithColumns } from '@rocicorp/zero';
+import type { MutatorContext, Schema, TableInsertRow, TableName, TableUpdateRow, Where } from './types';
 type SchemaTableBuilder<TName extends TableName> = TableBuilderWithColumns<Schema['tables'][TName]>;
 type MutationBuilder<Obj = any> = (ctx: MutatorContext, obj?: Obj) => Promise<void>;
 type MutationBuilders = Record<string, MutationBuilder>;

package/types/mutations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mutations.d.ts","sourceRoot":"","sources":["../src/mutations.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,cAAc,EACd,MAAM,EACN,cAAc,EACd,SAAS,EACT,cAAc,EACd,KAAK,EACN,MAAM,SAAS,CAAA;AAChB,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AAG7D,KAAK,kBAAkB,CAAC,KAAK,SAAS,SAAS,IAAI,uBAAuB,CACxE,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CACxB,CAAA;AA+DD,KAAK,eAAe,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AACnF,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;AAevD,KAAK,YAAY,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAA;AAEhD,KAAK,aAAa,CAAC,KAAK,SAAS,YAAY,IAAI;IAC/C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;CAC/C,CAAA;AAED,KAAK,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAA;AAE1D,KAAK,iBAAiB,CAAC,KAAK,SAAS,YAAY,EAAE,SAAS,SAAS,gBAAgB,IAAI;KACtF,GAAG,IAAI,SAAS,GAAG,MAAM,SAAS,GAAG,GAAG,SAAS,MAAM,SAAS,GAC7D,SAAS,CAAC,GAAG,CAAC,GACd,GAAG,SAAS,MAAM,aAAa,CAAC,GAAG,CAAC,GAClC,aAAa,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,GACzB,KAAK;CACZ,CAAA;AAED,wBAAgB,SAAS,CAAC,SAAS,SAAS,gBAAgB,EAC1D,SAAS,EAAE,SAAS,GACnB,SAAS,CAAA;AACZ,wBAAgB,SAAS,CAAC,KAAK,SAAS,YAAY,EAAE,WAAW,SAAS,KAAK,EAC7E,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,WAAW,GACvB,iBAAiB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;AAC/B,wBAAgB,SAAS,CACvB,KAAK,SAAS,YAAY,EAC1B,WAAW,SAAS,KAAK,EACzB,SAAS,SAAS,gBAAgB,EAElC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,GACnB,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;AAEtC,wBAAgB,SAAS,CAAC,KAAK,SAAS,SAAS,EAAE,WAAW,SAAS,KAAK,EAC1E,SAAS,EAAE,KAAK,EAChB,WAAW,EAAE,WAAW,GACvB,iBAAiB,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAA;AACnD,wBAAgB,SAAS,CACvB,KAAK,SAAS,SAAS,EACvB,WAAW,SAAS,KAAK,EACzB,SAAS,SAAS,gBAAgB,EAElC,SAAS,EAAE,KAAK,EAChB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,GACnB,iBAAiB,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,CAAA"}
+{"version":3,"file":"mutations.d.ts","sourceRoot":"","sources":["../src/mutations.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AAC7D,OAAO,KAAK,EACV,cAAc,EACd,MAAM,EACN,cAAc,EACd,SAAS,EACT,cAAc,EACd,KAAK,EACN,MAAM,SAAS,CAAA;AAGhB,KAAK,kBAAkB,CAAC,KAAK,SAAS,SAAS,IAAI,uBAAuB,CACxE,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CACxB,CAAA;AA2DD,KAAK,eAAe,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AACnF,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;AAevD,KAAK,YAAY,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAA;AAEhD,KAAK,aAAa,CAAC,KAAK,SAAS,YAAY,IAAI;IAC/C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;CAC/C,CAAA;AAED,KAAK,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAA;AAE1D,KAAK,iBAAiB,CAAC,KAAK,SAAS,YAAY,EAAE,SAAS,SAAS,gBAAgB,IAAI;KACtF,GAAG,IAAI,SAAS,GAAG,MAAM,SAAS,GAAG,GAAG,SAAS,MAAM,SAAS,GAC7D,SAAS,CAAC,GAAG,CAAC,GACd,GAAG,SAAS,MAAM,aAAa,CAAC,GAAG,CAAC,GAClC,aAAa,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,GACzB,KAAK;CACZ,CAAA;AAED,wBAAgB,SAAS,CAAC,SAAS,SAAS,gBAAgB,EAC1D,SAAS,EAAE,SAAS,GACnB,SAAS,CAAA;AACZ,wBAAgB,SAAS,CAAC,KAAK,SAAS,YAAY,EAAE,WAAW,SAAS,KAAK,EAC7E,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,WAAW,GACvB,iBAAiB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;AAC/B,wBAAgB,SAAS,CACvB,KAAK,SAAS,YAAY,EAC1B,WAAW,SAAS,KAAK,EACzB,SAAS,SAAS,gBAAgB,EAElC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,GACnB,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;AAEtC,wBAAgB,SAAS,CAAC,KAAK,SAAS,SAAS,EAAE,WAAW,SAAS,KAAK,EAC1E,SAAS,EAAE,KAAK,EAChB,WAAW,EAAE,WAAW,GACvB,iBAAiB,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAA;AACnD,wBAAgB,SAAS,CACvB,KAAK,SAAS,SAAS,EACvB,WAAW,SAAS,KAAK,EACzB,SAAS,SAAS,gBAAgB,EAElC,SAAS,EAAE,KAAK,EAChB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,GACnB,iBAAiB,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,CAAA"}

package/dist/cjs/helpers/didRunPermissionCheck.cjs

@@ -1,36 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all) __defProp(target, name, {
-    get: all[name],
-    enumerable: true
-  });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-      get: () => from[key],
-      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-    });
-  }
-  return to;
-};
-var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: true
-}), mod);
-var didRunPermissionCheck_exports = {};
-__export(didRunPermissionCheck_exports, {
-  getDidRunPermissionCheck: () => getDidRunPermissionCheck,
-  setDidRunPermissionCheck: () => setDidRunPermissionCheck
-});
-module.exports = __toCommonJS(didRunPermissionCheck_exports);
-var import_helpers = require("@take-out/helpers");
-const PermissionCheckRan = (0, import_helpers.globalValue)(`on-zero:permissions-check`, () => /* @__PURE__ */new WeakMap());
-const getDidRunPermissionCheck = ctx => {
-  return PermissionCheckRan.get(ctx);
-};
-const setDidRunPermissionCheck = ctx => {
-  return PermissionCheckRan.set(ctx, true);
-};

package/dist/cjs/helpers/didRunPermissionCheck.native.js

@@ -1,41 +0,0 @@
-"use strict";
-
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all) __defProp(target, name, {
-    get: all[name],
-    enumerable: true
-  });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-      get: () => from[key],
-      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-    });
-  }
-  return to;
-};
-var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: true
-}), mod);
-var didRunPermissionCheck_exports = {};
-__export(didRunPermissionCheck_exports, {
-  getDidRunPermissionCheck: () => getDidRunPermissionCheck,
-  setDidRunPermissionCheck: () => setDidRunPermissionCheck
-});
-module.exports = __toCommonJS(didRunPermissionCheck_exports);
-var import_helpers = require("@take-out/helpers");
-var PermissionCheckRan = (0, import_helpers.globalValue)(`on-zero:permissions-check`, function () {
-  return /* @__PURE__ */new WeakMap();
-});
-var getDidRunPermissionCheck = function (ctx) {
-  return PermissionCheckRan.get(ctx);
-};
-var setDidRunPermissionCheck = function (ctx) {
-  return PermissionCheckRan.set(ctx, true);
-};
-//# sourceMappingURL=didRunPermissionCheck.native.js.map

package/dist/cjs/helpers/didRunPermissionCheck.native.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","didRunPermissionCheck_exports","__export","getDidRunPermissionCheck","setDidRunPermissionCheck","module","exports","import_helpers","require","PermissionCheckRan","globalValue","WeakMap","ctx","get","set"],"sources":["../../../src/helpers/didRunPermissionCheck.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,6BAAA;AAAAC,QAAA,CAAAD,6BAAA;EAAAE,wBAAA,EAAAA,CAAA,KAAAA,wBAAA;EAAAC,wBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAV,YAA4B,CAAAK,6BAAA;AAI5B,IAAAM,cAAM,GAAAC,OAAA,oBAAqB;AAAA,IACzBC,kBAAA,OAAAF,cAAA,CAAAG,WAAA;EACA,OAAM,mBAAIC,OAAiC;AAC7C;AAEO,IAAAR,wBAAM,YAAAA,CAA4BS,GAAwB;EAC/D,OAAOH,kBAAA,CAAmBI,GAAA,CAAID,GAAG;AACnC;AAEO,IAAAR,wBAAM,YAAAA,CAA4BQ,GAAwB;EAC/D,OAAOH,kBAAA,CAAmBK,GAAA,CAAIF,GAAA,EAAK,IAAI;AACzC","ignoreList":[]}

package/dist/esm/helpers/didRunPermissionCheck.mjs

@@ -1,10 +0,0 @@
-import { globalValue } from "@take-out/helpers";
-const PermissionCheckRan = globalValue(`on-zero:permissions-check`, () => /* @__PURE__ */new WeakMap());
-const getDidRunPermissionCheck = ctx => {
-  return PermissionCheckRan.get(ctx);
-};
-const setDidRunPermissionCheck = ctx => {
-  return PermissionCheckRan.set(ctx, true);
-};
-export { getDidRunPermissionCheck, setDidRunPermissionCheck };
-//# sourceMappingURL=didRunPermissionCheck.mjs.map

package/dist/esm/helpers/didRunPermissionCheck.mjs.map

@@ -1 +0,0 @@
-{"version":3,"names":["globalValue","PermissionCheckRan","WeakMap","getDidRunPermissionCheck","ctx","get","setDidRunPermissionCheck","set"],"sources":["../../../src/helpers/didRunPermissionCheck.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,QAAmB;AAI5B,MAAMC,kBAAA,GAAqBD,WAAA,CACzB,6BACA,MAAM,mBAAIE,OAAA,CAAiC,CAC7C;AAEO,MAAMC,wBAAA,GAA4BC,GAAA,IAAwB;EAC/D,OAAOH,kBAAA,CAAmBI,GAAA,CAAID,GAAG;AACnC;AAEO,MAAME,wBAAA,GAA4BF,GAAA,IAAwB;EAC/D,OAAOH,kBAAA,CAAmBM,GAAA,CAAIH,GAAA,EAAK,IAAI;AACzC","ignoreList":[]}

package/dist/esm/helpers/didRunPermissionCheck.native.js

@@ -1,12 +0,0 @@
-import { globalValue } from "@take-out/helpers";
-var PermissionCheckRan = globalValue(`on-zero:permissions-check`, function () {
-  return /* @__PURE__ */new WeakMap();
-});
-var getDidRunPermissionCheck = function (ctx) {
-  return PermissionCheckRan.get(ctx);
-};
-var setDidRunPermissionCheck = function (ctx) {
-  return PermissionCheckRan.set(ctx, true);
-};
-export { getDidRunPermissionCheck, setDidRunPermissionCheck };
-//# sourceMappingURL=didRunPermissionCheck.native.js.map

package/dist/esm/helpers/didRunPermissionCheck.native.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["globalValue","PermissionCheckRan","WeakMap","getDidRunPermissionCheck","ctx","get","setDidRunPermissionCheck","set"],"sources":["../../../src/helpers/didRunPermissionCheck.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,QAAmB;AAI5B,IAAAC,kBAAM,GAAAD,WAAqB;EACzB,0BAAAE,OAAA;AAAA,EACA;AACF,IAAAC,wBAAA,YAAAA,CAAAC,GAAA;EAEO,OAAMH,kBAAA,CAAAI,GAAA,CAAAD,GAA4B;AACvC;AACF,IAAAE,wBAAA,YAAAA,CAAAF,GAAA;EAEO,OAAMH,kBAAA,CAAAM,GAAA,CAAAH,GAA4B,OAAwB;AAC/D;AACF,S","ignoreList":[]}

package/src/helpers/didRunPermissionCheck.ts

@@ -1,16 +0,0 @@
-import { globalValue } from '@take-out/helpers'
-
-import type { MutatorContext } from '../types'
-
-const PermissionCheckRan = globalValue(
-  `on-zero:permissions-check`,
-  () => new WeakMap<MutatorContext, boolean>(),
-)
-
-export const getDidRunPermissionCheck = (ctx: MutatorContext) => {
-  return PermissionCheckRan.get(ctx)
-}
-
-export const setDidRunPermissionCheck = (ctx: MutatorContext) => {
-  return PermissionCheckRan.set(ctx, true)
-}

package/types/helpers/didRunPermissionCheck.d.ts

@@ -1,4 +0,0 @@
-import type { MutatorContext } from '../types';
-export declare const getDidRunPermissionCheck: (ctx: MutatorContext) => boolean | undefined;
-export declare const setDidRunPermissionCheck: (ctx: MutatorContext) => WeakMap<MutatorContext, boolean>;
-//# sourceMappingURL=didRunPermissionCheck.d.ts.map

package/types/helpers/didRunPermissionCheck.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"didRunPermissionCheck.d.ts","sourceRoot":"","sources":["../../src/helpers/didRunPermissionCheck.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAO9C,eAAO,MAAM,wBAAwB,GAAI,KAAK,cAAc,wBAE3D,CAAA;AAED,eAAO,MAAM,wBAAwB,GAAI,KAAK,cAAc,qCAE3D,CAAA"}