on-zero 0.4.34 → 0.4.36

package/dist/esm/zeroRunner.native.js

@@ -9,6 +9,9 @@ function getRunner(instance) {
       return mutatorContext().tx.run(q, o);
     };
   }
+  return getAmbientRunner(instance);
+}
+function getAmbientRunner(instance) {
   if (instance === null || instance === void 0 ? void 0 : instance.runner) {
     return instance.runner;
   }
@@ -17,5 +20,5 @@ function getRunner(instance) {
   }
   return runner;
 }
-export { getRunner, setRunner };
+export { getAmbientRunner, getRunner, setRunner };
 //# sourceMappingURL=zeroRunner.native.js.map

package/dist/esm/zeroRunner.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["isInZeroMutation","mutatorContext","runner","setRunner","r","getRunner","instance","q","o","tx","run","Error"],"sources":["../../src/zeroRunner.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,gBAAA,EAAkBC,cAAA,QAAsB;AAgBjD,IAAIC,MAAA,GAA4B;AAEzB,SAASC,UAAUC,CAAA,EAAe;EACvCF,MAAA,GAASE,CAAA;AACX;AAEO,SAASC,UAAUC,QAAA,EAAsD;EAC9E,IAAIN,gBAAA,CAAiB,GAAG;IACtB,OAAO,UAAIO,CAAM,EAAAC,CAAA;MACnB,OAAAP,cAAA,GAAAQ,EAAA,CAAAC,GAAA,CAAAH,CAAA,EAAAC,CAAA;IAIA;EACE;EACF,IAAAF,QAAA,aAAAA,QAAA,uBAAAA,QAAA,CAAAJ,MAAA;IAEA,OAAKI,QAAQ,CAAAJ,MAAA;EACX;EAAU,IACR,CAAAA,MAAA;IACF,UAAAS,KAAA;EACF;EAEA,OAAOT,MAAA;AACT","ignoreList":[]}
+{"version":3,"names":["isInZeroMutation","mutatorContext","runner","setRunner","r","getRunner","instance","q","o","tx","run","getAmbientRunner","Error"],"sources":["../../src/zeroRunner.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,gBAAA,EAAkBC,cAAA,QAAsB;AAgBjD,IAAIC,MAAA,GAA4B;AAEzB,SAASC,UAAUC,CAAA,EAAe;EACvCF,MAAA,GAASE,CAAA;AACX;AAEO,SAASC,UAAUC,QAAA,EAAsD;EAC9E,IAAIN,gBAAA,CAAiB,GAAG;IACtB,OAAO,UAAIO,CAAM,EAAAC,CAAA;MACnB,OAAAP,cAAA,GAAAQ,EAAA,CAAAC,GAAA,CAAAH,CAAA,EAAAC,CAAA;IAEA;EACF;EAEO,OAASG,gBAAA,CAAiBL,QAAA;AAG/B;AACE,SAAAK,gBAAgBA,CAAAL,QAAA;EAClB,IAAAA,QAAA,aAAAA,QAAA,uBAAAA,QAAA,CAAAJ,MAAA;IAEA,OAAKI,QAAQ,CAAAJ,MAAA;EACX;EAAU,IACR,CAAAA,MAAA;IACF,UAAAU,KAAA;EACF;EAEA,OAAOV,MAAA;AACT","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "on-zero",
-  "version": "0.4.34",
+  "version": "0.4.36",
   "description": "A typed layer over @rocicorp/zero with queries, mutations, and permissions",
   "sideEffects": false,
   "source": "src/index.ts",
@@ -77,7 +77,7 @@
     }
   },
   "dependencies": {
-    "@take-out/helpers": "0.4.34",
+    "@take-out/helpers": "0.4.36",
     "chokidar": "^4.0.3",
     "citty": "^0.1.6",
     "valibot": "^1.1.0"

package/src/helpers/recoverZeroClient.test.ts

@@ -169,4 +169,37 @@ describe('zero recovery', () => {
     expect(deleteLocalState).not.toHaveBeenCalled()
     expect(reload).not.toHaveBeenCalled()
   })
+
+  // a host with a `window` shim but no real `location` — the sootsim tenant
+  // render-worker, which hides `location` for isolation. the DEFAULT reload
+  // path (no injected `deps.reload`) must still drop stale IDB and not throw
+  // "reading 'reload'" on undefined; it no-ops the reload and lets the host
+  // remount. previously crashed as an unhandled rejection.
+  test('default reload path is a safe no-op when location is absent', async () => {
+    const events: ZeroEvent[] = []
+    const zeroEvents = createEmitter<ZeroEvent | null>(`test-recover-${emitterSeq++}`, null)
+    zeroEvents.listen((event) => {
+      if (event) events.push(event)
+    })
+    const deleteLocalState = vi.fn(() => Promise.resolve())
+    // no `reload` dep — exercises the default `globalThis.location?.reload?.()`.
+    const deps: ZeroRecoveryDeps = { deleteLocalState, zeroEvents }
+    const originalLocation = globalThis.location
+    // simulate the worker: window exists (jsdom) but location is absent.
+    Object.defineProperty(globalThis, 'location', {
+      configurable: true,
+      value: undefined,
+    })
+    try {
+      makeZeroRecovery(deps).onClientStateNotFound()
+      await flush()
+    } finally {
+      Object.defineProperty(globalThis, 'location', {
+        configurable: true,
+        value: originalLocation,
+      })
+    }
+    expect(deleteLocalState).toHaveBeenCalledTimes(1)
+    expect(events).toContainEqual({ type: 'recovering', reason: 'client state not found' })
+  })
 })

package/src/helpers/recoverZeroClient.ts

@@ -74,7 +74,13 @@ function recover(
   reloadScheduled = true
   console.warn(`[on-zero] ${message} — recovering`)
   deps.zeroEvents.emit({ type: 'recovering', reason: message })
-  const doReload = deps.reload ?? (() => window.location.reload())
+  // resolve the reload exactly as @rocicorp/zero does internally
+  // (`getBrowserGlobal('location')?.reload()`, zero.js): read location off the
+  // global and optional-chain through it. a non-DOM host with a `window` shim
+  // but no real `location` (the sootsim tenant render-worker hides `location`
+  // for isolation) then drops its stale IDB and no-ops the reload — letting the
+  // host remount — instead of throwing "reading 'reload'" on undefined.
+  const doReload = deps.reload ?? (() => globalThis.location?.reload?.())
   // defer one microtask so sibling instances failing in the same tick enqueue
   // their deletes first, then await them all before reloading.
   Promise.resolve()

package/src/multiInstance.test.tsx

@@ -4,10 +4,12 @@ import { describe, expect, test, vi } from 'vitest'
 
 import { combineZeroClients } from './combineZeroClients'
 import { createZeroClient } from './createZeroClient'
+import { runWithContext } from './helpers/mutatorContext'
 import { getInstanceForNamespace, registerClientInstance } from './instanceRegistry'
 import { registerQuery } from './queryRegistry'
 import { run } from './run'
 import { setRunner, type ZeroRunner } from './zeroRunner'
+import { zql } from './zql'
 
 import type { ZeroEvent } from './types'
 import type { AnyQueryRegistry, Query } from '@rocicorp/zero'
@@ -89,6 +91,73 @@ describe('multi-instance namespace dispatch', () => {
     expect(request.query.queryName).toBe('runUser.byId')
   })
 
+  test('run() rejects named queries inside server mutation context', async () => {
+    const { byId } = makeClient('run-ctx-owner', 'runCtxThing')
+    const ownerRunner = vi.fn(async (..._args: unknown[]) => ({ from: 'owner' }))
+    getInstanceForNamespace('runCtxThing')!.runner = ownerRunner as ZeroRunner
+    const txRun = vi.fn(async (..._args: unknown[]) => ({ from: 'tx' }))
+
+    await expect(
+      runWithContext(
+        {
+          authData: null,
+          environment: 'server',
+          can: async () => {},
+          tx: { run: txRun },
+        } as any,
+        () => run(byId, { id: '1' }),
+      ),
+    ).rejects.toThrow(/run\(namedQuery\) cannot be used inside a Zero mutation/)
+
+    expect(ownerRunner).not.toHaveBeenCalled()
+    expect(txRun).not.toHaveBeenCalled()
+  })
+
+  test('run() keeps named queries on their owning client runner when browser context leaks', async () => {
+    const { byId } = makeClient('run-client-leak-owner', 'runClientLeakThing')
+    const ownerRunner = vi.fn(async (..._args: unknown[]) => ({ from: 'owner' }))
+    getInstanceForNamespace('runClientLeakThing')!.runner = ownerRunner as ZeroRunner
+    const txRun = vi.fn(async (..._args: unknown[]) => ({ from: 'tx' }))
+
+    await expect(
+      runWithContext(
+        {
+          authData: null,
+          environment: 'client',
+          can: async () => {},
+          tx: { run: txRun },
+        } as any,
+        () => run(byId, { id: '1' }),
+      ),
+    ).resolves.toEqual({ from: 'owner' })
+
+    expect(ownerRunner).toHaveBeenCalledTimes(1)
+    expect(txRun).not.toHaveBeenCalled()
+  })
+
+  test('run() keeps inline zql on the active transaction runner', async () => {
+    makeClient('run-inline-context', 'runInlineThing')
+    const ambientRunner = vi.fn(async (..._args: unknown[]) => ({ from: 'ambient' }))
+    setRunner(ambientRunner as ZeroRunner)
+    const txRun = vi.fn(async (..._args: unknown[]) => ({ from: 'tx' }))
+    const query = zql.user.where('id', '1')
+
+    await expect(
+      runWithContext(
+        {
+          authData: null,
+          environment: 'client',
+          can: async () => {},
+          tx: { run: txRun },
+        } as any,
+        () => run(query),
+      ),
+    ).resolves.toEqual({ from: 'tx' })
+
+    expect(txRun).toHaveBeenCalledWith(query, undefined)
+    expect(ambientRunner).not.toHaveBeenCalled()
+  })
+
   test('a claimed namespace with an unmounted instance uses the ambient runner (server path)', async () => {
     const { byId } = makeClient('srv-instance', 'srvThing')
     const ambient = vi.fn(async (..._args: unknown[]) => ({ from: 'ambient' }))

package/src/run.ts

@@ -1,6 +1,7 @@
 import { getInstanceForQueryFn } from './instanceRegistry'
 import { resolveQuery, type PlainQueryFn } from './resolveQuery'
-import { getRunner } from './zeroRunner'
+import { isInZeroMutation, mutatorContext } from './helpers/mutatorContext'
+import { getAmbientRunner, getRunner } from './zeroRunner'
 
 import type {
   AnyQueryRegistry,
@@ -75,11 +76,18 @@ export function run(
     return getRunner()(queryOrFn, options)
   }
 
+  const inMutation = isInZeroMutation()
+  if (inMutation && mutatorContext().environment === 'server') {
+    throw new Error(
+      'run(namedQuery) cannot be used inside a Zero mutation. Use tx.run(zql...) for transactional mutation reads.',
+    )
+  }
+
   // with multiple client instances mounted, a named query executes against
   // the instance that claimed its namespace, not whichever mounted last
   const instance = getInstanceForQueryFn(queryOrFn)
   const customQueries = instance?.customQueries ?? getCustomQueries()
   const queryRequest = resolveQuery({ customQueries, fn: queryOrFn, params })
 
-  return getRunner(instance)(queryRequest as any, options)
+  return getAmbientRunner(instance)(queryRequest as any, options)
 }

package/src/zeroRunner.ts

@@ -25,6 +25,10 @@ export function getRunner(instance?: { runner: ZeroRunner | null }): ZeroRunner
     return (q, o) => mutatorContext().tx.run(q, o)
   }
 
+  return getAmbientRunner(instance)
+}
+
+export function getAmbientRunner(instance?: { runner: ZeroRunner | null }): ZeroRunner {
   // a mounted instance's own runner wins; otherwise the ambient runner
   // (single-instance client, or the server transaction runner)
   if (instance?.runner) {

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

@@ -1 +1 @@
-{"version":3,"file":"recoverZeroClient.d.ts","sourceRoot":"","sources":["../../src/helpers/recoverZeroClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AACzC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AACxD,OAAO,KAAK,EAAqB,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAUlE,MAAM,MAAM,gBAAgB,GAAG;IAI7B,gBAAgB,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAA;IAExC,UAAU,EAAE,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAAA;IAGrC,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAElC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAA;CACpB,CAAA;AAgED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,gBAAgB;2BAE5B,kBAAkB;;EAsB5C;AAyBD,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,gBAAgB,EACtB,eAAe,CAAC,EAAE,OAAO,GACxB,OAAO,CAwBT;AAID,wBAAgB,0BAA0B,SAGzC"}
+{"version":3,"file":"recoverZeroClient.d.ts","sourceRoot":"","sources":["../../src/helpers/recoverZeroClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AACzC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AACxD,OAAO,KAAK,EAAqB,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAUlE,MAAM,MAAM,gBAAgB,GAAG;IAI7B,gBAAgB,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAA;IAExC,UAAU,EAAE,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAAA;IAGrC,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAElC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAA;CACpB,CAAA;AAsED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,gBAAgB;2BAE5B,kBAAkB;;EAsB5C;AAyBD,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,gBAAgB,EACtB,eAAe,CAAC,EAAE,OAAO,GACxB,OAAO,CAwBT;AAID,wBAAgB,0BAA0B,SAGzC"}

package/types/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAGhE,OAAO,KAAK,EACV,gBAAgB,EAChB,aAAa,EACb,KAAK,EACL,MAAM,IAAI,UAAU,EACrB,MAAM,gBAAgB,CAAA;AAIvB,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,QAEzD;AAaD,wBAAgB,GAAG,CACjB,MAAM,SAAS,UAAU,EACzB,MAAM,SAAS,MAAM,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC9C,OAAO,EAEP,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EACrC,IAAI,CAAC,EAAE,UAAU,GAChB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAA;AAElC,wBAAgB,GAAG,CACjB,MAAM,SAAS,UAAU,EACzB,IAAI,EACJ,MAAM,SAAS,MAAM,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC9C,OAAO,EAEP,EAAE,EAAE,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,EACtD,MAAM,EAAE,IAAI,EACZ,IAAI,CAAC,EAAE,UAAU,GAChB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAA;AAElC,wBAAgB,GAAG,CACjB,MAAM,SAAS,UAAU,EACzB,MAAM,SAAS,MAAM,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC9C,OAAO,EAEP,EAAE,EAAE,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,EACtD,IAAI,CAAC,EAAE,UAAU,GAChB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAA"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../src/run.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAIhE,OAAO,KAAK,EACV,gBAAgB,EAChB,aAAa,EACb,KAAK,EACL,MAAM,IAAI,UAAU,EACrB,MAAM,gBAAgB,CAAA;AAIvB,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,QAEzD;AAaD,wBAAgB,GAAG,CACjB,MAAM,SAAS,UAAU,EACzB,MAAM,SAAS,MAAM,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC9C,OAAO,EAEP,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EACrC,IAAI,CAAC,EAAE,UAAU,GAChB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAA;AAElC,wBAAgB,GAAG,CACjB,MAAM,SAAS,UAAU,EACzB,IAAI,EACJ,MAAM,SAAS,MAAM,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC9C,OAAO,EAEP,EAAE,EAAE,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,EACtD,MAAM,EAAE,IAAI,EACZ,IAAI,CAAC,EAAE,UAAU,GAChB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAA;AAElC,wBAAgB,GAAG,CACjB,MAAM,SAAS,UAAU,EACzB,MAAM,SAAS,MAAM,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,EAC9C,OAAO,EAEP,EAAE,EAAE,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,EACtD,IAAI,CAAC,EAAE,UAAU,GAChB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAA"}

package/types/zeroRunner.d.ts

@@ -5,4 +5,7 @@ export declare function setRunner(r: ZeroRunner): void;
 export declare function getRunner(instance?: {
     runner: ZeroRunner | null;
 }): ZeroRunner;
+export declare function getAmbientRunner(instance?: {
+    runner: ZeroRunner | null;
+}): ZeroRunner;
 //# sourceMappingURL=zeroRunner.d.ts.map

package/types/zeroRunner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zeroRunner.d.ts","sourceRoot":"","sources":["../src/zeroRunner.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,aAAa,EACb,KAAK,EACL,UAAU,EACV,MAAM,IAAI,UAAU,EACrB,MAAM,gBAAgB,CAAA;AAEvB,YAAY,EAAE,UAAU,EAAE,CAAA;AAE1B,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,EAC/B,KAAK,EAAE,KAAK,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,EACtC,OAAO,CAAC,EAAE,UAAU,KACjB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAA;AAIpC,wBAAgB,SAAS,CAAC,CAAC,EAAE,UAAU,QAEtC;AAED,wBAAgB,SAAS,CAAC,QAAQ,CAAC,EAAE;IAAE,MAAM,EAAE,UAAU,GAAG,IAAI,CAAA;CAAE,GAAG,UAAU,CAkB9E"}
+{"version":3,"file":"zeroRunner.d.ts","sourceRoot":"","sources":["../src/zeroRunner.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,aAAa,EACb,KAAK,EACL,UAAU,EACV,MAAM,IAAI,UAAU,EACrB,MAAM,gBAAgB,CAAA;AAEvB,YAAY,EAAE,UAAU,EAAE,CAAA;AAE1B,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,EAC/B,KAAK,EAAE,KAAK,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,EACtC,OAAO,CAAC,EAAE,UAAU,KACjB,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAA;AAIpC,wBAAgB,SAAS,CAAC,CAAC,EAAE,UAAU,QAEtC;AAED,wBAAgB,SAAS,CAAC,QAAQ,CAAC,EAAE;IAAE,MAAM,EAAE,UAAU,GAAG,IAAI,CAAA;CAAE,GAAG,UAAU,CAM9E;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,CAAC,EAAE;IAAE,MAAM,EAAE,UAAU,GAAG,IAAI,CAAA;CAAE,GAAG,UAAU,CAcrF"}