over-zero 0.0.32 → 0.0.34

package/src/cli.ts

@@ -1,9 +1,10 @@
 #!/usr/bin/env node
+import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from 'node:fs'
+import { basename, resolve } from 'node:path'
+
 import { ModelToValibot } from '@sinclair/typebox-codegen/model'
 import { TypeScriptToModel } from '@sinclair/typebox-codegen/typescript'
 import { defineCommand, runMain } from 'citty'
-import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from 'node:fs'
-import { basename, resolve } from 'node:path'
 import * as ts from 'typescript'
 
 /**
@@ -113,56 +114,6 @@ const generateQueries = defineCommand({
   },
 })
 
-function generateServerQueriesFile(
-  queries: Array<{ name: string; params: string; valibotCode: string }>
-) {
-  const imports = `import * as v from 'valibot'\nimport * as queries from './queries'\n`
-
-  const validators = queries
-    .map((q) => {
-      // extract just the schema definition (without import and type export)
-      const lines = q.valibotCode.split('\n').filter((l) => l.trim())
-      // find line starting with "export const QueryParams"
-      const schemaLineIndex = lines.findIndex((l) =>
-        l.startsWith('export const QueryParams')
-      )
-      if (schemaLineIndex === -1) {
-        return `export const ${q.name}Schema = v.void()`
-      }
-
-      // get the full schema (might be multiline)
-      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
-
-        // count braces to know when we're done
-        openBraces += (cleaned.match(/\{/g) || []).length
-        openBraces -= (cleaned.match(/\}/g) || []).length
-        openBraces += (cleaned.match(/\(/g) || []).length
-        openBraces -= (cleaned.match(/\)/g) || []).length
-
-        // done when braces are balanced and we have at least one line
-        if (openBraces === 0 && schemaLines.length > 0) {
-          break
-        }
-      }
-
-      const schemaDef = schemaLines.join('\n')
-      return `export const ${q.name}Schema = ${schemaDef}`
-    })
-    .join('\n\n')
-
-  const queryMap = `\nexport const queryValidators = {\n${queries.map((q) => `  ${q.name}: ${q.name}Schema,`).join('\n')}\n} as const\n`
-
-  return imports + '\n' + validators + '\n' + queryMap
-}
-
 const generate = defineCommand({
   meta: {
     name: 'generate',
@@ -323,14 +274,23 @@ const generate = defineCommand({
         )
 
         const allQueries = queryResults.flat()
-        const queriesOutput = generateQueriesFile(allQueries)
-        const queriesChanged = writeFileIfChanged(
-          resolve(generatedDir, 'queries.ts'),
-          queriesOutput
+        const groupedQueriesOutput = generateGroupedQueriesFile(allQueries)
+        const syncedQueriesOutput = generateSyncedQueriesFile(allQueries)
+
+        const groupedChanged = writeFileIfChanged(
+          resolve(generatedDir, 'groupedQueries.ts'),
+          groupedQueriesOutput
+        )
+        const syncedChanged = writeFileIfChanged(
+          resolve(generatedDir, 'syncedQueries.ts'),
+          syncedQueriesOutput
         )
 
-        if (queriesChanged) {
-          console.info(`  📝 Updated queries.ts`)
+        if (groupedChanged) {
+          console.info(`  📝 Updated groupedQueries.ts`)
+        }
+        if (syncedChanged) {
+          console.info(`  📝 Updated syncedQueries.ts`)
         }
 
         console.info(
@@ -445,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 generateQueriesFile(
+function generateGroupedQueriesFile(
   queries: Array<{
     name: string
     params: string
@@ -453,82 +413,119 @@ function generateQueriesFile(
     sourceFile: string
   }>
 ) {
-  // sort queries alphabetically
-  const sortedQueries = [...queries].sort((a, b) => a.name.localeCompare(b.name))
+  // get unique source files sorted
+  const sortedFiles = [...new Set(queries.map((q) => q.sourceFile))].sort()
+
+  // generate re-exports
+  const exports = sortedFiles
+    .map((file) => `export * as ${file} from '../queries/${file}'`)
+    .join('\n')
+
+  return `/**
+ * auto-generated by: over-zero generate
+ *
+ * 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.
+ */
+${exports}
+`
+}
 
-  // Group queries by source file
+function generateSyncedQueriesFile(
+  queries: Array<{
+    name: string
+    params: string
+    valibotCode: string
+    sourceFile: string
+  }>
+) {
+  // group queries by source file
   const queryByFile = new Map<string, typeof queries>()
-  for (const q of sortedQueries) {
+  for (const q of queries) {
     if (!queryByFile.has(q.sourceFile)) {
       queryByFile.set(q.sourceFile, [])
     }
     queryByFile.get(q.sourceFile)!.push(q)
   }
 
-  // Generate imports for each query file (sorted)
-  const queryImports = Array.from(queryByFile.keys())
-    .sort()
-    .map((file) => `import * as ${file}Queries from '../queries/${file}'`)
-    .join('\n')
+  // sort file names for consistent output
+  const sortedFiles = Array.from(queryByFile.keys()).sort()
 
-  const imports = `import * as v from 'valibot'
+  const imports = `// auto-generated by: over-zero generate
+// server-side syncedQuery wrappers with validators
 import { syncedQuery } from '@rocicorp/zero'
-${queryImports}
+import * as v from 'valibot'
+import * as Queries from './groupedQueries'
 `
 
-  const syncedQueries = 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')
-      )
+  // generate grouped exports by namespace
+  const namespaceExports = sortedFiles
+    .map((file) => {
+      const fileQueries = queryByFile
+        .get(file)!
+        .sort((a, b) => a.name.localeCompare(b.name))
+
+      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}]))`
-
-      // 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 `export const ${q.name} = syncedQuery('${q.name}', ${wrappedValidator}, ${queryFn})`
+          // 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()'
+              ? `() => Queries.${file}.${q.name}()`
+              : `(arg) => Queries.${file}.${q.name}(arg)`
+
+          return `  ${q.name}: syncedQuery('${namespacedName}', ${wrappedValidator}, ${queryFn}),`
+        })
+        .join('\n')
+
+      return `export const ${file} = {\n${queryDefs}\n}`
     })
     .join('\n\n')
 
-  return imports + '\n' + syncedQueries + '\n'
+  return `${imports}
+${namespaceExports}
+`
 }
 
 function generateReadmeFile() {
@@ -541,7 +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.ts\` - synced query definitions with validators
+- \`groupedQueries.ts\` - namespaced query re-exports for client setup
+- \`syncedQueries.ts\` - namespaced syncedQuery wrappers for server setup
 
 ## usage guidelines
 
@@ -549,16 +547,15 @@ this folder is auto-generated by over-zero. do not edit files here directly.
 
 ### queries
 
-don't import queries from this folder on the client. instead, import from \`../queries/\`:
+write your queries as plain functions in \`../queries/\` and import them directly:
 
 \`\`\`ts
-// ❌ bad - don't import from generated
-import { channelMessages } from '~/data/generated/queries'
-
 // ✅ good - import from queries
 import { channelMessages } from '~/data/queries/message'
 \`\`\`
 
+the generated query files are only used internally by zero client/server setup.
+
 ### types
 
 you can import types from this folder, but prefer re-exporting from \`../types.ts\`:

package/src/createPermissions.ts

@@ -1,15 +1,17 @@
+import { ensure, EnsureError } from '@vxrn/helpers'
+
+import { setDidRunPermissionCheck } from './helpers/didRunPermissionCheck'
+import { mutatorContext } from './helpers/mutatorContext'
+import { prettyFormatZeroQuery } from './helpers/prettyFormatZeroQuery'
+import { getWhereTableName } from './where'
+
+import type { AuthData, Can, TableName, Transaction, Where } from './types'
 import type {
   Condition,
   ExpressionBuilder,
   Query,
   Schema as ZeroSchema,
 } from '@rocicorp/zero'
-import { ensure, EnsureError } from '@vxrn/helpers'
-import { setDidRunPermissionCheck } from './helpers/didRunPermissionCheck'
-import { mutatorContext } from './helpers/mutatorContext'
-import { prettyFormatZeroQuery } from './helpers/prettyFormatZeroQuery'
-import type { AuthData, Can, TableName, Transaction, Where } from './types'
-import { getWhereTableName } from './where'
 
 export function createPermissions<Schema extends ZeroSchema>({
   environment,

package/src/createZeroClient.tsx

@@ -1,34 +1,56 @@
-import type {
-  HumanReadable,
-  Query,
-  ReadonlyJSONValue,
-  Row,
-  SyncedQuery,
-  Zero,
-  ZeroOptions,
-  Schema as ZeroSchema,
-} from '@rocicorp/zero'
 import { syncedQuery } from '@rocicorp/zero'
 import { useZero, ZeroProvider, useQuery as zeroUseQuery } from '@rocicorp/zero/react'
 import { createEmitter, mapObject } from '@vxrn/helpers'
 import { createContext, use, useMemo, type ReactNode } from 'react'
+
 import { createPermissions } from './createPermissions'
 import { createMutators } from './helpers/createMutators'
 import { prettyFormatZeroQuery } from './helpers/prettyFormatZeroQuery'
 import { useZeroDebug } from './helpers/useZeroDebug'
+import { registerQuery, getQueryName } from './queryRegistry'
 import { setAuthData, setSchema } from './state'
+
 import type { AuthData, GenericModels, GetZeroMutators, ZeroEvent } from './types'
+import type {
+  HumanReadable,
+  Query,
+  ReadonlyJSONValue,
+  Row,
+  SyncedQuery,
+  Zero,
+  ZeroOptions,
+  Schema as ZeroSchema,
+} from '@rocicorp/zero'
+
+// grouped queries: { namespace: { queryName: queryFn } }
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type GroupedQueries = Record<string, Record<string, (...args: any[]) => any>>
 
 export function createZeroClient<
   Schema extends ZeroSchema,
   Models extends GenericModels,
->({ schema, models }: { schema: Schema; models: Models }) {
+>({
+  schema,
+  models,
+  groupedQueries,
+}: {
+  schema: Schema
+  models: Models
+  groupedQueries: GroupedQueries
+}) {
   type ZeroMutators = GetZeroMutators<Models>
   type ZeroInstance = Zero<Schema, ZeroMutators>
   type TableName = keyof ZeroInstance['query']
 
   setSchema(schema)
 
+  // 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}`)
+    }
+  }
+
   const DisabledContext = createContext(false)
 
   const modelWritePermissions = mapObject(models, (val) => val.permissions) as {
@@ -170,7 +192,7 @@ export function createZeroClient<
       }
 
       const fn = queryOrFn
-      const queryName = fn.name || 'anonymousQuery'
+      const queryName = getQueryName(fn) || fn.name || 'anonymousQuery'
 
       // Determine if this is Pattern 2 (with params) or Pattern 3 (no params)
       const hasParams =
@@ -200,7 +222,7 @@ export function createZeroClient<
     const out = zeroUseQuery(actualQuery, options)
 
     if (process.env.NODE_ENV === 'development') {
-      // biome-ignore lint/correctness/useHookAtTopLevel: ok
+      // eslint-disable-next-line react-hooks/rules-of-hooks
       useZeroDebug(actualQuery, options, out)
     }
 
@@ -218,10 +240,10 @@ export function createZeroClient<
     ...props
   }: Omit<ZeroOptions<Schema, ZeroMutators>, 'schema' | 'mutators'> & {
     children: ReactNode
-    authData?: AuthData
+    authData?: AuthData | null
     disable?: boolean
   }) => {
-    const authData = authDataIn as AuthData
+    const authData = (authDataIn ?? null) as AuthData
 
     const mutators = useMemo(() => {
       setAuthData(authData)

package/src/createZeroServer.ts

@@ -1,19 +1,13 @@
-import type {
-  HumanReadable,
-  Query,
-  ReadonlyJSONValue,
-  SyncedQuery,
-  Schema as ZeroSchema,
-} from '@rocicorp/zero'
-import type { TransactionProviderInput } from '@rocicorp/zero/pg'
 import { handleGetQueriesRequest, PushProcessor } from '@rocicorp/zero/pg'
 import { zeroNodePg } from '@rocicorp/zero/server/adapters/pg'
 import { assertString, randomId } from '@vxrn/helpers'
 import { Pool } from 'pg'
+
 import { createPermissions } from './createPermissions'
 import { createMutators } from './helpers/createMutators'
 import { isInZeroMutation, mutatorContext } from './helpers/mutatorContext'
 import { setAuthData, setSchema } from './state'
+
 import type {
   AsyncAction,
   AuthData,
@@ -21,21 +15,32 @@ import type {
   GetZeroMutators,
   Transaction,
 } from './types'
+import type {
+  HumanReadable,
+  Query,
+  ReadonlyJSONValue,
+  SyncedQuery,
+  Schema as ZeroSchema,
+} from '@rocicorp/zero'
+import type { TransactionProviderInput } from '@rocicorp/zero/pg'
+
+// grouped synced queries: { namespace: { queryName: SyncedQuery } }
+export type SyncedQueries = Record<
+  string,
+  Record<string, SyncedQuery<any, any, any, any, any>>
+>
 
 export function createZeroServer<
   Schema extends ZeroSchema,
   Models extends GenericModels,
   ServerActions extends Record<string, unknown>,
-  Queries extends Record<string, SyncedQuery<any, any, any, any, any>> = Record<
-    string,
-    never
-  >,
+  Queries extends SyncedQueries = Record<string, never>,
 >({
   createServerActions,
   database,
   schema,
   models,
-  queries,
+  syncedQueries,
 }: {
   /**
    * The DB connection string, same as ZERO_UPSTREAM_DB
@@ -44,7 +49,7 @@ export function createZeroServer<
   schema: Schema
   models: Models
   createServerActions: () => ServerActions
-  queries?: Queries
+  syncedQueries?: Queries
 }) {
   setSchema(schema)
 
@@ -107,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,
@@ -115,7 +130,7 @@ export function createZeroServer<
     request: Request
   }) => {
     function getQuery(name: string, args: readonly ReadonlyJSONValue[]) {
-      const q = queries?.[name]
+      const q = queryLookup.get(name)
       if (!q) {
         throw new Error(`No such query: ${name}`)
       }

package/src/helpers/batchQuery.ts

@@ -1,6 +1,7 @@
-import type { Query, Row } from '@rocicorp/zero'
 import { sleep } from '@vxrn/helpers'
 
+import type { Query, Row } from '@rocicorp/zero'
+
 export async function batchQuery<Q extends Query<any, any, any>, Item extends Row<Q>>(
   q: Q,
   mapper: (items: Item[]) => Promise<void>,

package/src/helpers/createMutators.ts

@@ -1,4 +1,7 @@
 import { isClient, isServer, mapObject, time } from '@vxrn/helpers'
+
+import { runWithContext } from './mutatorContext'
+
 import type {
   AuthData,
   Can,
@@ -7,7 +10,6 @@ import type {
   MutatorContext,
   Transaction,
 } from '../types'
-import { runWithContext } from './mutatorContext'
 
 export function createMutators<Models extends GenericModels>({
   environment,

package/src/helpers/didRunPermissionCheck.ts

@@ -1,4 +1,5 @@
 import { globalValue } from '@vxrn/helpers'
+
 import type { MutatorContext } from '../types'
 
 const PermissionCheckRan = globalValue(

package/src/helpers/ensureLoggedIn.ts

@@ -1,7 +1,9 @@
 import { ensure } from '@vxrn/helpers'
-import type { AuthData } from '../types'
+
 import { mutatorContext } from './mutatorContext'
 
+import type { AuthData } from '../types'
+
 export const ensureLoggedIn = (): AuthData => {
   const { authData } = mutatorContext()
   ensure(authData, 'logged in')

package/src/helpers/getQueryOrMutatorAuthData.ts

@@ -1,7 +1,8 @@
 import { getAuthData } from '../state'
-import type { AuthData } from '../types'
 import { isInZeroMutation, mutatorContext } from './mutatorContext'
 
+import type { AuthData } from '../types'
+
 export function getQueryOrMutatorAuthData(): AuthData | null {
   if (isInZeroMutation()) {
     return mutatorContext().authData as AuthData

package/src/helpers/mutatorContext.ts

@@ -1,4 +1,5 @@
 import { createAsyncContext } from '@vxrn/helpers'
+
 import type { MutatorContext } from '../types'
 
 const asyncContext = createAsyncContext<MutatorContext>()

package/src/helpers/prettyFormatZeroQuery.ts

@@ -1,6 +1,7 @@
-import type { Query } from '@rocicorp/zero'
 import { ellipsis } from '@vxrn/helpers'
 
+import type { Query } from '@rocicorp/zero'
+
 export const prettyFormatZeroQuery = (
   query: Query<any, any, any>,
   mode: 'full' | 'minimal' = 'full'

package/src/helpers/useZeroDebug.ts

@@ -1,8 +1,10 @@
-import type { Query } from '@rocicorp/zero'
 import { getCurrentComponentStack } from '@vxrn/helpers'
 import { useEffect, useId } from 'react'
+
 import { prettyFormatZeroQuery } from './prettyFormatZeroQuery'
 
+import type { Query } from '@rocicorp/zero'
+
 const activeQueries = new Map<string, number>()
 
 // AST change tracking

package/src/index.ts

@@ -1,4 +1,5 @@
 export * from './createPermissions'
+export * from './queryRegistry'
 export * from './helpers/batchQuery'
 export * from './helpers/createMutators'
 export * from './helpers/ensureLoggedIn'

package/src/mutations.ts

@@ -1,5 +1,5 @@
-import type { TableBuilderWithColumns } from '@rocicorp/zero'
 import { getDidRunPermissionCheck } from './helpers/didRunPermissionCheck'
+
 import type {
   MutatorContext,
   TableInsertRow,
@@ -7,6 +7,7 @@ import type {
   TableUpdateRow,
   Where,
 } from './types'
+import type { TableBuilderWithColumns } from '@rocicorp/zero'
 
 // two ways to use it:
 //  - mutations({}) which doesn't add the "allowed" helper or add CRUD

package/src/queryRegistry.ts

@@ -0,0 +1,12 @@
+// registry for query functions to their stable names
+// this allows minification while preserving query identity
+
+const queryNameRegistry = new WeakMap<Function, string>()
+
+export function registerQuery(fn: Function, name: string) {
+  queryNameRegistry.set(fn, name)
+}
+
+export function getQueryName(fn: Function): string | undefined {
+  return queryNameRegistry.get(fn)
+}

package/src/serverWhere.ts

@@ -1,7 +1,8 @@
-import type { Condition } from '@rocicorp/zero'
-import type { TableName, Where } from './types'
 import { where } from './where'
 
+import type { TableName, Where } from './types'
+import type { Condition } from '@rocicorp/zero'
+
 export function serverWhere<Table extends TableName, Builder extends Where<Table>>(
   tableName: Table,
   builder: Builder