deps: zero v0.25

Author: maxstevens-nl

README.md

@@ -59,8 +59,8 @@ To query data:
 ```js
 import { useQuery, useZero } from './use-zero.ts'
 
-const z = useZero()
-const { data: users } = useQuery(() => z.value.query.user)
+const zero = useZero()
+const { data: users } = useQuery(() => zero.value.query.user)
 ```
 
 > [!TIP]

package.json

@@ -35,7 +35,7 @@
     "vue": "^3.5.13"
   },
   "dependencies": {
-    "@rocicorp/zero": "^0.24.3000000000"
+    "@rocicorp/zero": "0.25.0-canary.18"
   },
   "devDependencies": {
     "@antfu/eslint-config": "latest",
@@ -51,7 +51,8 @@
     "typescript": "latest",
     "unbuild": "latest",
     "vitest": "latest",
-    "vue": "3.5.25"
+    "vue": "3.5.25",
+    "zod": "4.1.13"
   },
   "resolutions": {
     "zero-vue": "link:."

playground/src/app.vue

@@ -12,17 +12,17 @@ import { useQuery, useZero } from './zero'
 
 const cookies = useCookies()
 
-const z = useZero()
-const { data: users } = useQuery(() => z.value.query.user)
-const { data: mediums } = useQuery(() => z.value.query.medium)
-const { data: allMessages } = useQuery(() => z.value.query.message)
+const zero = useZero()
+const { data: users } = useQuery(() => zero.value.query.user)
+const { data: mediums } = useQuery(() => zero.value.query.medium)
+const { data: allMessages } = useQuery(() => zero.value.query.message)
 
 const filterUser = ref('')
 const filterText = ref('')
 const action = ref<'add' | 'remove' | undefined>(undefined)
 
 const { data: filteredMessages } = useQuery(() => {
-  let filtered = z.value.query.message
+  let filtered = zero.value.query.message
     .related('medium', medium => medium.one())
     .related('sender', sender => sender.one())
     .orderBy('timestamp', 'desc')
@@ -45,13 +45,13 @@ function deleteRandomMessage() {
     return false
   }
   const index = randInt(allMessages.value.length)
-  z.value.mutate.message.delete({ id: allMessages.value[index]!.id })
+  zero.value.mutate.message.delete({ id: allMessages.value[index]!.id })
 
   return true
 }
 
 function addRandomMessage() {
-  z.value.mutate.message.insert(randomMessage(users.value, mediums.value))
+  zero.value.mutate.message.insert(randomMessage(users.value, mediums.value))
   return true
 }
 
@@ -85,7 +85,7 @@ function handleAddAction() {
 }
 
 function handleRemoveAction(e: MouseEvent | TouchEvent) {
-  if (z.value.userID === 'anon' && 'shiftKey' in e && !e.shiftKey) {
+  if (zero.value.userID === 'anon' && 'shiftKey' in e && !e.shiftKey) {
     // eslint-disable-next-line no-alert
     alert('You must be logged in to delete. Hold shift to try anyway.')
     return
@@ -107,7 +107,7 @@ function stopAction() {
 }
 
 function editMessage(e: MouseEvent, id: string, senderID: string, prev: string) {
-  if (senderID !== z.value.userID && !e.shiftKey) {
+  if (senderID !== zero.value.userID && !e.shiftKey) {
     // eslint-disable-next-line no-alert
     alert(
       'You aren\'t logged in as the sender of this message. Editing won\'t be permitted. Hold the shift key to try anyway.',
@@ -117,14 +117,14 @@ function editMessage(e: MouseEvent, id: string, senderID: string, prev: string)
 
   // eslint-disable-next-line no-alert
   const body = prompt('Edit message', prev)
-  z.value.mutate.message.update({
+  zero.value.mutate.message.update({
     id,
     body: body ?? prev,
   })
 }
 
 async function toggleLogin() {
-  if (z.value.userID === 'anon') {
+  if (zero.value.userID === 'anon') {
     const jwt = await new SignJWT({ sub: 'ENzoNm7g4E' })
       .setProtectedHeader({ alg: 'HS256' })
       .sign(new TextEncoder().encode(import.meta.env.VITE_PUBLIC_AUTH_SECRET))
@@ -135,7 +135,7 @@ async function toggleLogin() {
   }
 }
 
-const user = computed(() => users.value.find(user => user.id === z.value.userID)?.name ?? 'anon')
+const user = computed(() => users.value.find(user => user.id === zero.value.userID)?.name ?? 'anon')
 </script>
 
 <template>

pnpm-lock.yaml

@@ -69,15 +69,15 @@ describe('createZeroComposables', () => {
   })
 
   it('useQuery works whithout explicitly calling useZero', async () => {
-    const z = new Zero({
+    const zero = new Zero({
       userID: 'test-user',
       server: null,
       schema: testSchema,
       kvStore: 'mem' as const,
     })
 
-    await z.mutate.test.insert({ id: 1, name: 'test1' })
-    await z.mutate.test.insert({ id: 2, name: 'test2' })
+    await zero.mutate.test.insert({ id: 1, name: 'test1' })
+    await zero.mutate.test.insert({ id: 2, name: 'test2' })
 
     const builder = createBuilder(testSchema)
     const byIdQuery = syncedQuery(
@@ -94,7 +94,7 @@ describe('createZeroComposables', () => {
     )
 
     const { useQuery } = createZeroComposables({
-      zero: z,
+      zero,
     })
 
     const { data } = useQuery(() => byIdQuery(1))
@@ -135,7 +135,7 @@ describe('createZeroComposables', () => {
   })
 
   it('is created lazily and once', async () => {
-    const z = new Zero({
+    const zero = new Zero({
       userID: 'test-user',
       server: null,
       schema: testSchema,
@@ -146,7 +146,7 @@ describe('createZeroComposables', () => {
     const accessCountPerCreation = 2
 
     const proxiedOpts = new Proxy(
-      { zero: z },
+      { zero },
       {
         get(target, prop) {
           if (prop === 'zero') {

src/create-zero-composables.test.ts

@@ -40,8 +40,8 @@ export function createZeroComposables<
     query: MaybeRefOrGetter<Query<S, TTable, TReturn>>,
     options?: MaybeRefOrGetter<UseQueryOptions>,
   ): QueryResult<TReturn> {
-    const z = useZero()
-    return _useQuery(z, query, options)
+    const zero = useZero()
+    return _useQuery(zero, query, options)
   }
 
   return {

src/create-zero-composables.ts

@@ -27,9 +27,9 @@ async function setupTestEnvironment() {
     kvStore: 'mem',
   }))
 
-  const z = useZero()
-  await z.value.mutate.table.insert({ a: 1, b: 'a' })
-  await z.value.mutate.table.insert({ a: 2, b: 'b' })
+  const zero = useZero()
+  await zero.value.mutate.table.insert({ a: 1, b: 'a' })
+  await zero.value.mutate.table.insert({ a: 2, b: 'b' })
 
   const builder = createBuilder(schema)
   const byIdQuery = syncedQuery(
@@ -45,13 +45,13 @@ async function setupTestEnvironment() {
     },
   )
 
-  const tableQuery = z!.value.query.table
+  const tableQuery = zero!.value.query.table
 
   onTestFinished(() => {
-    z.value.close()
+    zero.value.close()
   })
 
-  return { z, tableQuery, useQuery, byIdQuery, userID }
+  return { z: zero, tableQuery, useQuery, byIdQuery, userID }
 }
 
 describe('useQuery', () => {
@@ -257,16 +257,16 @@ describe('useQuery', () => {
   })
 
   it('can still be used without createZero', async () => {
-    const z = new Zero({
+    const zero = new Zero({
       userID: 'test-user',
       server: null,
       schema,
       kvStore: 'mem' as const,
     })
-    await z.mutate.table.insert({ a: 1, b: 'a' })
-    await z.mutate.table.insert({ a: 2, b: 'b' })
+    await zero.mutate.table.insert({ a: 1, b: 'a' })
+    await zero.mutate.table.insert({ a: 2, b: 'b' })
 
-    const { data: rows, status } = useQuery(z, () => z.query.table)
+    const { data: rows, status } = useQuery(zero, () => zero.query.table)
     expect(rows.value).toMatchInlineSnapshot(`[
   {
     "a": 1,
@@ -281,6 +281,6 @@ describe('useQuery', () => {
 ]`)
     expect(status.value).toEqual('unknown')
 
-    z.close()
+    zero.close()
   })
 })