over-zero 0.0.33 → 0.0.34

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

@@ -1 +1 @@
-{"version":3,"names":["handleGetQueriesRequest","PushProcessor","zeroNodePg","assertString","randomId","Pool","createPermissions","createMutators","isInZeroMutation","mutatorContext","setAuthData","setSchema","createZeroServer","param","createServerActions","database","schema","models","serverQueries","dbString","zeroDb","connectionString","permissions","environment","processor","handleMutationRequest","param2","authData","request","skipAsyncTasks","asyncTasks","mutators","can","response","process","length","id","console","info","Promise","all","map","task","then","catch","err","error","handleQueryRequest","getQuery","name","args","_serverQueries_namespace","namespace","queryName","split","q","Error","query","mutate","run","email","role","transaction","tx","t","query2","output","dummyTransactionInput","cb","clientGroupID","clientID","mutationID","upstreamSchema"],"sources":["../../src/createZeroServer.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["handleGetQueriesRequest","PushProcessor","zeroNodePg","assertString","randomId","Pool","createPermissions","createMutators","isInZeroMutation","mutatorContext","setAuthData","setSchema","createZeroServer","param","createServerActions","database","schema","models","syncedQueries","dbString","zeroDb","connectionString","permissions","environment","processor","handleMutationRequest","param2","authData","request","skipAsyncTasks","asyncTasks","mutators","can","response","process","length","id","console","info","Promise","all","map","task","then","catch","err","error","queryLookup","Map","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Object","entries","Symbol","iterator","_step","next","done","namespace","queries","value","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","_step1","queryName","syncedQuery","set","return","handleQueryRequest","getQuery","name","args","q","get","Error","query","mutate","run","email","role","transaction","tx","t","query2","output","dummyTransactionInput"],"sources":["../../src/createZeroServer.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "over-zero",
-  "version": "0.0.33",
+  "version": "0.0.34",
   "sideEffects": false,
   "source": "src/index.ts",
   "main": "dist/cjs",

package/src/cli.ts

@@ -274,23 +274,23 @@ const generate = defineCommand({
         )
 
         const allQueries = queryResults.flat()
-        const clientQueriesOutput = generateClientQueriesFile(allQueries)
-        const serverQueriesOutput = generateServerQueriesFile(allQueries)
+        const groupedQueriesOutput = generateGroupedQueriesFile(allQueries)
+        const syncedQueriesOutput = generateSyncedQueriesFile(allQueries)
 
-        const clientChanged = writeFileIfChanged(
-          resolve(generatedDir, 'queries.client.ts'),
-          clientQueriesOutput
+        const groupedChanged = writeFileIfChanged(
+          resolve(generatedDir, 'groupedQueries.ts'),
+          groupedQueriesOutput
         )
-        const serverChanged = writeFileIfChanged(
-          resolve(generatedDir, 'queries.server.ts'),
-          serverQueriesOutput
+        const syncedChanged = writeFileIfChanged(
+          resolve(generatedDir, 'syncedQueries.ts'),
+          syncedQueriesOutput
         )
 
-        if (clientChanged) {
-          console.info(`  📝 Updated queries.client.ts`)
+        if (groupedChanged) {
+          console.info(`  📝 Updated groupedQueries.ts`)
         }
-        if (serverChanged) {
-          console.info(`  📝 Updated queries.server.ts`)
+        if (syncedChanged) {
+          console.info(`  📝 Updated syncedQueries.ts`)
         }
 
         console.info(
@@ -405,7 +405,7 @@ function generateTablesFile(modelFiles: string[]) {
   return `// auto-generated by: over-zero generate\n// this is separate from models as otherwise you end up with circular types :/\n\n${exports}\n`
 }
 
-function generateClientQueriesFile(
+function generateGroupedQueriesFile(
   queries: Array<{
     name: string
     params: string
@@ -416,30 +416,23 @@ function generateClientQueriesFile(
   // get unique source files sorted
   const sortedFiles = [...new Set(queries.map((q) => q.sourceFile))].sort()
 
-  // generate imports
-  const imports = sortedFiles
-    .map((file) => `import * as ${file}Queries from '../queries/${file}'`)
+  // generate re-exports
+  const exports = sortedFiles
+    .map((file) => `export * as ${file} from '../queries/${file}'`)
     .join('\n')
 
-  // generate namespaced export object
-  const namespaces = sortedFiles.map((file) => `  ${file}: ${file}Queries,`).join('\n')
-
   return `/**
  * auto-generated by: over-zero generate
  *
- * client-side query references for minification-safe query identity.
+ * grouped query re-exports for minification-safe query identity.
  * this file re-exports all query modules - while this breaks tree-shaking,
  * queries are typically small and few in number even in larger apps.
  */
-${imports}
-
-export const clientQueries = {
-${namespaces}
-}
+${exports}
 `
 }
 
-function generateServerQueriesFile(
+function generateSyncedQueriesFile(
   queries: Array<{
     name: string
     params: string
@@ -459,95 +452,79 @@ function generateServerQueriesFile(
   // sort file names for consistent output
   const sortedFiles = Array.from(queryByFile.keys()).sort()
 
-  // generate imports
-  const queryImports = sortedFiles
-    .map((file) => `import * as ${file}Queries from '../queries/${file}'`)
-    .join('\n')
-
   const imports = `// auto-generated by: over-zero generate
 // server-side syncedQuery wrappers with validators
 import { syncedQuery } from '@rocicorp/zero'
 import * as v from 'valibot'
-${queryImports}
+import * as Queries from './groupedQueries'
 `
 
-  // generate synced queries grouped by namespace
-  const sortedQueries = [...queries].sort((a, b) => a.name.localeCompare(b.name))
+  // generate grouped exports by namespace
+  const namespaceExports = sortedFiles
+    .map((file) => {
+      const fileQueries = queryByFile
+        .get(file)!
+        .sort((a, b) => a.name.localeCompare(b.name))
 
-  const syncedQueryDefs = sortedQueries
-    .map((q) => {
-      // extract validator schema
-      const lines = q.valibotCode.split('\n').filter((l) => l.trim())
-      const schemaLineIndex = lines.findIndex((l) =>
-        l.startsWith('export const QueryParams')
-      )
+      const queryDefs = fileQueries
+        .map((q) => {
+          // extract validator schema
+          const lines = q.valibotCode.split('\n').filter((l) => l.trim())
+          const schemaLineIndex = lines.findIndex((l) =>
+            l.startsWith('export const QueryParams')
+          )
 
-      let validatorDef = 'v.void()'
-      if (schemaLineIndex !== -1) {
-        const schemaLines: string[] = []
-        let openBraces = 0
-        let started = false
-
-        for (let i = schemaLineIndex; i < lines.length; i++) {
-          const line = lines[i]!
-          const cleaned = started ? line : line.replace('export const QueryParams = ', '')
-          schemaLines.push(cleaned)
-          started = true
-
-          openBraces += (cleaned.match(/\{/g) || []).length
-          openBraces -= (cleaned.match(/\}/g) || []).length
-          openBraces += (cleaned.match(/\(/g) || []).length
-          openBraces -= (cleaned.match(/\)/g) || []).length
-
-          if (openBraces === 0 && schemaLines.length > 0) {
-            break
+          let validatorDef = 'v.void()'
+          if (schemaLineIndex !== -1) {
+            const schemaLines: string[] = []
+            let openBraces = 0
+            let started = false
+
+            for (let i = schemaLineIndex; i < lines.length; i++) {
+              const line = lines[i]!
+              const cleaned = started
+                ? line
+                : line.replace('export const QueryParams = ', '')
+              schemaLines.push(cleaned)
+              started = true
+
+              openBraces += (cleaned.match(/\{/g) || []).length
+              openBraces -= (cleaned.match(/\}/g) || []).length
+              openBraces += (cleaned.match(/\(/g) || []).length
+              openBraces -= (cleaned.match(/\)/g) || []).length
+
+              if (openBraces === 0 && schemaLines.length > 0) {
+                break
+              }
+            }
+            validatorDef = schemaLines.join('\n')
           }
-        }
-        validatorDef = schemaLines.join('\n')
-      }
 
-      // wrap validator in v.parser(v.tuple([...]))
-      const wrappedValidator =
-        validatorDef === 'v.void()'
-          ? 'v.parser(v.tuple([]))'
-          : `v.parser(v.tuple([${validatorDef}]))`
-
-      // namespaced query name: file.queryName
-      const namespacedName = `${q.sourceFile}.${q.name}`
-
-      // for void queries, no arg parameter
-      const queryFn =
-        validatorDef === 'v.void()'
-          ? `() => {
-    return ${q.sourceFile}Queries.${q.name}()
-  }`
-          : `(arg) => {
-    return ${q.sourceFile}Queries.${q.name}(arg)
-  }`
-
-      return `const ${q.name}Synced = syncedQuery('${namespacedName}', ${wrappedValidator}, ${queryFn})`
-    })
-    .join('\n\n')
+          // wrap validator in v.parser(v.tuple([...]))
+          const wrappedValidator =
+            validatorDef === 'v.void()'
+              ? 'v.parser(v.tuple([]))'
+              : `v.parser(v.tuple([${validatorDef}]))`
 
-  // generate namespaced export object
-  const namespaces = sortedFiles
-    .map((file) => {
-      const fileQueries = queryByFile
-        .get(file)!
-        .sort((a, b) => a.name.localeCompare(b.name))
-      const queryEntries = fileQueries
-        .map((q) => `    ${q.name}: ${q.name}Synced,`)
+          // namespaced query name: file.queryName
+          const namespacedName = `${q.sourceFile}.${q.name}`
+
+          // for void queries, no arg parameter
+          const queryFn =
+            validatorDef === 'v.void()'
+              ? `() => Queries.${file}.${q.name}()`
+              : `(arg) => Queries.${file}.${q.name}(arg)`
+
+          return `  ${q.name}: syncedQuery('${namespacedName}', ${wrappedValidator}, ${queryFn}),`
+        })
         .join('\n')
-      return `  ${file}: {\n${queryEntries}\n  },`
+
+      return `export const ${file} = {\n${queryDefs}\n}`
     })
-    .join('\n')
+    .join('\n\n')
 
   return `${imports}
-${syncedQueryDefs}
-
-export const serverQueries = {
-${namespaces}
-}
+${namespaceExports}
 `
 }
 
@@ -561,8 +538,8 @@ this folder is auto-generated by over-zero. do not edit files here directly.
 - \`models.ts\` - exports all models from ../models
 - \`types.ts\` - typescript types derived from table schemas
 - \`tables.ts\` - exports table schemas for type inference
-- \`queries.client.ts\` - namespaced query references for client setup
-- \`queries.server.ts\` - namespaced syncedQuery wrappers for server setup
+- \`groupedQueries.ts\` - namespaced query re-exports for client setup
+- \`syncedQueries.ts\` - namespaced syncedQuery wrappers for server setup
 
 ## usage guidelines
 

package/src/createZeroClient.tsx

@@ -22,8 +22,9 @@ import type {
   Schema as ZeroSchema,
 } from '@rocicorp/zero'
 
+// grouped queries: { namespace: { queryName: queryFn } }
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type ClientQueries = Record<string, Record<string, (...args: any[]) => any>>
+export type GroupedQueries = Record<string, Record<string, (...args: any[]) => any>>
 
 export function createZeroClient<
   Schema extends ZeroSchema,
@@ -31,11 +32,11 @@ export function createZeroClient<
 >({
   schema,
   models,
-  clientQueries,
+  groupedQueries,
 }: {
   schema: Schema
   models: Models
-  clientQueries: ClientQueries
+  groupedQueries: GroupedQueries
 }) {
   type ZeroMutators = GetZeroMutators<Models>
   type ZeroInstance = Zero<Schema, ZeroMutators>
@@ -43,8 +44,8 @@ export function createZeroClient<
 
   setSchema(schema)
 
-  // build query registry from namespaced clientQueries
-  for (const [namespace, queries] of Object.entries(clientQueries)) {
+  // build query registry from grouped queries
+  for (const [namespace, queries] of Object.entries(groupedQueries)) {
     for (const [name, fn] of Object.entries(queries)) {
       registerQuery(fn, `${namespace}.${name}`)
     }

package/src/createZeroServer.ts

@@ -24,8 +24,8 @@ import type {
 } from '@rocicorp/zero'
 import type { TransactionProviderInput } from '@rocicorp/zero/pg'
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type ServerQueries = Record<
+// grouped synced queries: { namespace: { queryName: SyncedQuery } }
+export type SyncedQueries = Record<
   string,
   Record<string, SyncedQuery<any, any, any, any, any>>
 >
@@ -34,12 +34,13 @@ export function createZeroServer<
   Schema extends ZeroSchema,
   Models extends GenericModels,
   ServerActions extends Record<string, unknown>,
+  Queries extends SyncedQueries = Record<string, never>,
 >({
   createServerActions,
   database,
   schema,
   models,
-  serverQueries,
+  syncedQueries,
 }: {
   /**
    * The DB connection string, same as ZERO_UPSTREAM_DB
@@ -48,7 +49,7 @@ export function createZeroServer<
   schema: Schema
   models: Models
   createServerActions: () => ServerActions
-  serverQueries?: ServerQueries
+  syncedQueries?: Queries
 }) {
   setSchema(schema)
 
@@ -111,6 +112,16 @@ export function createZeroServer<
     }
   }
 
+  // build flat lookup map from grouped syncedQueries: "namespace.queryName" => SyncedQuery
+  const queryLookup = new Map<string, SyncedQuery<any, any, any, any, any>>()
+  if (syncedQueries) {
+    for (const [namespace, queries] of Object.entries(syncedQueries)) {
+      for (const [queryName, syncedQuery] of Object.entries(queries)) {
+        queryLookup.set(`${namespace}.${queryName}`, syncedQuery)
+      }
+    }
+  }
+
   const handleQueryRequest = async ({
     authData,
     request,
@@ -119,9 +130,7 @@ export function createZeroServer<
     request: Request
   }) => {
     function getQuery(name: string, args: readonly ReadonlyJSONValue[]) {
-      // name format: "namespace.queryName" (e.g. "post.allPosts")
-      const [namespace, queryName] = name.split('.')
-      const q = serverQueries?.[namespace!]?.[queryName!]
+      const q = queryLookup.get(name)
       if (!q) {
         throw new Error(`No such query: ${name}`)
       }

package/types/createZeroClient.d.ts

@@ -1,11 +1,11 @@
 import { type ReactNode } from 'react';
 import type { AuthData, GenericModels, GetZeroMutators, ZeroEvent } from './types';
 import type { HumanReadable, Query, Row, SyncedQuery, Zero, ZeroOptions, Schema as ZeroSchema } from '@rocicorp/zero';
-export type ClientQueries = Record<string, Record<string, (...args: any[]) => any>>;
-export declare function createZeroClient<Schema extends ZeroSchema, Models extends GenericModels>({ schema, models, clientQueries, }: {
+export type GroupedQueries = Record<string, Record<string, (...args: any[]) => any>>;
+export declare function createZeroClient<Schema extends ZeroSchema, Models extends GenericModels>({ schema, models, groupedQueries, }: {
     schema: Schema;
     models: Models;
-    clientQueries: ClientQueries;
+    groupedQueries: GroupedQueries;
 }): {
     zeroEvents: import("@vxrn/helpers").Emitter<ZeroEvent | null>;
     ProvideZero: ({ children, authData: authDataIn, disable, ...props }: Omit<ZeroOptions<Schema, GetZeroMutators<Models>>, "schema" | "mutators"> & {

package/types/createZeroClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createZeroClient.d.ts","sourceRoot":"","sources":["../src/createZeroClient.tsx"],"names":[],"mappings":"AAGA,OAAO,EAA+B,KAAK,SAAS,EAAE,MAAM,OAAO,CAAA;AASnE,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAClF,OAAO,KAAK,EACV,aAAa,EACb,KAAK,EAEL,GAAG,EACH,WAAW,EACX,IAAI,EACJ,WAAW,EACX,MAAM,IAAI,UAAU,EACrB,MAAM,gBAAgB,CAAA;AAGvB,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAA;AAEnF,wBAAgB,gBAAgB,CAC9B,MAAM,SAAS,UAAU,EACzB,MAAM,SAAS,aAAa,EAC5B,EACA,MAAM,EACN,MAAM,EACN,aAAa,GACd,EAAE;IACD,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,aAAa,EAAE,aAAa,CAAA;CAC7B;;yEAyMI,IAAI,CAAC,WAAW,CAAC,MAAM,0BAAe,EAAE,QAAQ,GAAG,UAAU,CAAC,GAAG;QAClE,QAAQ,EAAE,SAAS,CAAA;QACnB,QAAQ,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAA;QAC1B,OAAO,CAAC,EAAE,OAAO,CAAA;KAClB;;SAxFiB,MAAM,SAAS,MAAM,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,OAAO,SAEnE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,GAC9B,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,YACzD;sBAhBA,OAAO,GAAG,SAAS;kBACvB,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS;YAejB,OAAO;SAInB,IAAI,EAAE,MAAM,SAAS,MAAM,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,OAAO,8DAErE,IAAI,YACF;sBAvBA,OAAO,GAAG,SAAS;kBACvB,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS;YAsBjB,OAAO;SAInB,MAAM,SAAS,MAAM,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,OAAO,gEAE7D;sBA7BA,OAAO,GAAG,SAAS;kBACvB,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS;YA4BjB,OAAO;;oBAtFd,CAAC,iDACf,CAAC,WACC,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,yCAG9D,OAAO,GAAG,IAAI;;EAwNlB"}
+{"version":3,"file":"createZeroClient.d.ts","sourceRoot":"","sources":["../src/createZeroClient.tsx"],"names":[],"mappings":"AAGA,OAAO,EAA+B,KAAK,SAAS,EAAE,MAAM,OAAO,CAAA;AASnE,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAClF,OAAO,KAAK,EACV,aAAa,EACb,KAAK,EAEL,GAAG,EACH,WAAW,EACX,IAAI,EACJ,WAAW,EACX,MAAM,IAAI,UAAU,EACrB,MAAM,gBAAgB,CAAA;AAIvB,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAA;AAEpF,wBAAgB,gBAAgB,CAC9B,MAAM,SAAS,UAAU,EACzB,MAAM,SAAS,aAAa,EAC5B,EACA,MAAM,EACN,MAAM,EACN,cAAc,GACf,EAAE;IACD,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,cAAc,EAAE,cAAc,CAAA;CAC/B;;yEAyMI,IAAI,CAAC,WAAW,CAAC,MAAM,0BAAe,EAAE,QAAQ,GAAG,UAAU,CAAC,GAAG;QAClE,QAAQ,EAAE,SAAS,CAAA;QACnB,QAAQ,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAA;QAC1B,OAAO,CAAC,EAAE,OAAO,CAAA;KAClB;;SAxFiB,MAAM,SAAS,MAAM,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,OAAO,SAEnE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,GAC9B,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,YACzD;sBAhBA,OAAO,GAAG,SAAS;kBACvB,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS;YAejB,OAAO;SAInB,IAAI,EAAE,MAAM,SAAS,MAAM,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,OAAO,8DAErE,IAAI,YACF;sBAvBA,OAAO,GAAG,SAAS;kBACvB,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS;YAsBjB,OAAO;SAInB,MAAM,SAAS,MAAM,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE,OAAO,gEAE7D;sBA7BA,OAAO,GAAG,SAAS;kBACvB,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS;YA4BjB,OAAO;;oBAtFd,CAAC,iDACf,CAAC,WACC,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,yCAG9D,OAAO,GAAG,IAAI;;EAwNlB"}

package/types/createZeroServer.d.ts

@@ -1,7 +1,7 @@
 import type { AsyncAction, AuthData, GenericModels, GetZeroMutators, Transaction } from './types';
 import type { HumanReadable, Query, ReadonlyJSONValue, SyncedQuery, Schema as ZeroSchema } from '@rocicorp/zero';
-export type ServerQueries = Record<string, Record<string, SyncedQuery<any, any, any, any, any>>>;
-export declare function createZeroServer<Schema extends ZeroSchema, Models extends GenericModels, ServerActions extends Record<string, unknown>>({ createServerActions, database, schema, models, serverQueries, }: {
+export type SyncedQueries = Record<string, Record<string, SyncedQuery<any, any, any, any, any>>>;
+export declare function createZeroServer<Schema extends ZeroSchema, Models extends GenericModels, ServerActions extends Record<string, unknown>, Queries extends SyncedQueries = Record<string, never>>({ createServerActions, database, schema, models, syncedQueries, }: {
     /**
      * The DB connection string, same as ZERO_UPSTREAM_DB
      */
@@ -9,7 +9,7 @@ export declare function createZeroServer<Schema extends ZeroSchema, Models exten
     schema: Schema;
     models: Models;
     createServerActions: () => ServerActions;
-    serverQueries?: ServerQueries;
+    syncedQueries?: Queries;
 }): {
     handleMutationRequest: ({ authData, request, skipAsyncTasks, }: {
         authData: AuthData | null;

package/types/createZeroServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createZeroServer.d.ts","sourceRoot":"","sources":["../src/createZeroServer.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,WAAW,EACX,QAAQ,EACR,aAAa,EACb,eAAe,EACf,WAAW,EACZ,MAAM,SAAS,CAAA;AAChB,OAAO,KAAK,EACV,aAAa,EACb,KAAK,EACL,iBAAiB,EACjB,WAAW,EACX,MAAM,IAAI,UAAU,EACrB,MAAM,gBAAgB,CAAA;AAIvB,MAAM,MAAM,aAAa,GAAG,MAAM,CAChC,MAAM,EACN,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CACrD,CAAA;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,SAAS,UAAU,EACzB,MAAM,SAAS,aAAa,EAC5B,aAAa,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7C,EACA,mBAAmB,EACnB,QAAQ,EACR,MAAM,EACN,MAAM,EACN,aAAa,GACd,EAAE;IACD;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,mBAAmB,EAAE,MAAM,aAAa,CAAA;IACxC,aAAa,CAAC,EAAE,aAAa,CAAA;CAC9B;oEAuBI;QACD,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAA;QACzB,OAAO,EAAE,OAAO,CAAA;QAChB,cAAc,CAAC,EAAE,OAAO,CAAA;KACzB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iDAsCE;QACD,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAA;QACzB,OAAO,EAAE,OAAO,CAAA;KACjB;;;;;;;;;;;;;;;;;;;;;;;kBAmDC,EAAE,SAAS,CAAC,EAAE,EAAE,WAAW,KAAK,OAAO,CAAC,GAAG,CAAC,EAC5C,OAAO,SAAS,EAAE,SAAS,CAAC,EAAE,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,SACrE,EAAE,KAAG,OAAO,CAAC,OAAO,CAAC;kBA7BvB,CAAC,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAE,eAAe,CAAC,MAAM,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,aAC/D,IAAI,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC;YA2ChD,CAAC,MACV,CAAC,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,KAAK,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,KACrD,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;EAqB7B"}
+{"version":3,"file":"createZeroServer.d.ts","sourceRoot":"","sources":["../src/createZeroServer.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,WAAW,EACX,QAAQ,EACR,aAAa,EACb,eAAe,EACf,WAAW,EACZ,MAAM,SAAS,CAAA;AAChB,OAAO,KAAK,EACV,aAAa,EACb,KAAK,EACL,iBAAiB,EACjB,WAAW,EACX,MAAM,IAAI,UAAU,EACrB,MAAM,gBAAgB,CAAA;AAIvB,MAAM,MAAM,aAAa,GAAG,MAAM,CAChC,MAAM,EACN,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CACrD,CAAA;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,SAAS,UAAU,EACzB,MAAM,SAAS,aAAa,EAC5B,aAAa,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7C,OAAO,SAAS,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EACrD,EACA,mBAAmB,EACnB,QAAQ,EACR,MAAM,EACN,MAAM,EACN,aAAa,GACd,EAAE;IACD;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,mBAAmB,EAAE,MAAM,aAAa,CAAA;IACxC,aAAa,CAAC,EAAE,OAAO,CAAA;CACxB;oEAuBI;QACD,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAA;QACzB,OAAO,EAAE,OAAO,CAAA;QAChB,cAAc,CAAC,EAAE,OAAO,CAAA;KACzB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iDAgDE;QACD,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAA;QACzB,OAAO,EAAE,OAAO,CAAA;KACjB;;;;;;;;;;;;;;;;;;;;;;;kBAiDC,EAAE,SAAS,CAAC,EAAE,EAAE,WAAW,KAAK,OAAO,CAAC,GAAG,CAAC,EAC5C,OAAO,SAAS,EAAE,SAAS,CAAC,EAAE,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,SACrE,EAAE,KAAG,OAAO,CAAC,OAAO,CAAC;kBA7BvB,CAAC,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAE,eAAe,CAAC,MAAM,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,aAC/D,IAAI,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC;YA2ChD,CAAC,MACV,CAAC,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,KAAK,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,KACrD,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;EAqB7B"}