on-zero 0.4.7 → 0.4.8

package/dist/esm/generate.test.native.js

@@ -230,6 +230,93 @@ export const mutate = mutations({
     expect(content).toContain("reset");
     expect(content).toContain("v.string()");
   });
+  test("generates validators for string-model multiline mutation params", async function () {
+    writeFileSync(join(testDir, "models/agentEvent.ts"), `
+import { mutations, serverWhere } from 'on-zero'
+
+const perm = serverWhere('agentEvent', () => true)
+
+export const mutate = mutations('agentEvent', perm, {
+  claimReviewLease: async (
+    { tx },
+    props: {
+      id: string
+      projectId: string
+      agentId: string
+      userId: string
+      taskId: string
+      reviewKey: string
+      runnerId: string
+      createdAt: number
+    },
+  ) => {
+    await tx.mutate.agentEvent.insert(props)
+  },
+})
+`);
+    await generate({
+      dir: testDir,
+      silent: true
+    });
+    var content = readFileSync(join(testDir, "generated/syncedMutations.ts"), "utf-8");
+    expect(content).toContain("claimReviewLease");
+    expect(content).toContain("projectId: v.string()");
+    expect(content).toContain("createdAt: v.number()");
+    expect(content).not.toContain("claimReviewLease: v.object({})");
+  });
+  test("generates validators for object intersections", async function () {
+    writeFileSync(join(testDir, "models/agent.ts"), `
+import { mutations, serverWhere } from 'on-zero'
+
+const perm = serverWhere('agent', () => true)
+
+export const mutate = mutations('agent', perm, {
+  update: async (
+    { tx },
+    props: {
+      id: string
+    } & {
+      status?: string
+      currentTaskId?: string
+      [key: string]: unknown
+    },
+  ) => {
+    await tx.mutate.agent.update(props)
+  },
+})
+`);
+    await generate({
+      dir: testDir,
+      silent: true
+    });
+    var content = readFileSync(join(testDir, "generated/syncedMutations.ts"), "utf-8");
+    expect(content).toContain("update");
+    expect(content).toContain("id: v.string()");
+    expect(content).toContain("status: v.optional(v.string())");
+    expect(content).toContain("currentTaskId: v.optional(v.string())");
+    expect(content).not.toContain("update: v.object({})");
+    expect(content).not.toContain("[key");
+  });
+  test("uses v.unknown for untyped mutation payloads", async function () {
+    writeFileSync(join(testDir, "models/project.ts"), `
+import { mutations, serverWhere } from 'on-zero'
+
+const perm = serverWhere('project', () => true)
+
+export const mutate = mutations('project', perm, {
+  insert: async ({ tx }, project) => {
+    await tx.mutate.project.insert(project)
+  },
+})
+`);
+    await generate({
+      dir: testDir,
+      silent: true
+    });
+    var content = readFileSync(join(testDir, "generated/syncedMutations.ts"), "utf-8");
+    expect(content).toContain("insert: v.unknown()");
+    expect(content).not.toContain("insert: v.void_()");
+  });
   test("handles mutations with only context param (void)", async function () {
     writeFileSync(join(testDir, "models/user.ts"), `
 import { table, string } from 'on-zero'

package/dist/esm/generate.test.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["existsSync","mkdirSync","readFileSync","rmSync","writeFileSync","tmpdir","join","afterEach","beforeEach","describe","expect","test","generate","testDir","Date","now","recursive","force","result","dir","silent","modelCount","toBe","schemaCount","filesChanged","toBeGreaterThan","modelsContent","toContain","typesContent","tablesContent","queryCount","groupedContent","syncedContent","not","markerFile","after","first","second","mutationCount","content","toMatch"],"sources":["../../src/generate.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["existsSync","mkdirSync","readFileSync","rmSync","writeFileSync","tmpdir","join","afterEach","beforeEach","describe","expect","test","generate","testDir","Date","now","recursive","force","result","dir","silent","modelCount","toBe","schemaCount","filesChanged","toBeGreaterThan","modelsContent","toContain","typesContent","tablesContent","queryCount","groupedContent","syncedContent","not","markerFile","after","first","second","mutationCount","content","toMatch"],"sources":["../../src/generate.test.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "on-zero",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "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.7",
+    "@take-out/helpers": "0.4.8",
     "chokidar": "^4.0.3",
     "citty": "^0.1.6",
     "valibot": "^1.1.0"

package/src/createZeroClient.tsx

@@ -37,6 +37,11 @@ export type GroupedQueries = Record<string, Record<string, (...args: any[]) => a
 //  - 'optimistic-allow': return true until server confirms
 export type PermissionStrategy = 'optimistic' | 'optimistic-deny' | 'optimistic-allow'
 
+function getZeroProxyValue(instance: object, key: PropertyKey) {
+  const value = Reflect.get(instance, key, instance)
+  return typeof value === 'function' ? value.bind(instance) : value
+}
+
 export function createZeroClient<
   Schema extends ZeroSchema,
   Models extends GenericModels,
@@ -175,7 +180,7 @@ export function createZeroClient<
           `Zero instance not initialized. Ensure ZeroProvider is mounted before accessing 'zero'.`,
         )
       }
-      return Reflect.get(latestZeroInstance, key, latestZeroInstance)
+      return getZeroProxyValue(latestZeroInstance, key)
     },
   })
 

package/src/generate-helpers.ts

@@ -17,7 +17,7 @@ export type ExtractedMutation = {
   name: string
   // 'void' | inline type string | unresolved reference
   paramType: string
-  // generated valibot code, or '' if skipped (falls back to v.unknown() or v.void_())
+  // generated valibot code, or '' when the payload is void/unknown
   valibotCode: string
 }
 
@@ -87,6 +87,93 @@ function splitTopLevelTypeUnion(type: string): string[] {
   return parts.filter(Boolean)
 }
 
+function splitTopLevelTypeIntersection(type: string): string[] {
+  const parts: string[] = []
+  let depth = 0
+  let start = 0
+  let quote: string | null = null
+
+  for (let i = 0; i < type.length; i++) {
+    const char = type[i]
+    if (quote) {
+      if (char === '\\') {
+        i++
+        continue
+      }
+      if (char === quote) quote = null
+      continue
+    }
+    if (char === '"' || char === "'" || char === '`') {
+      quote = char
+      continue
+    }
+    if (char === '<' || char === '(' || char === '{' || char === '[') {
+      depth++
+      continue
+    }
+    if (char === '>' || char === ')' || char === '}' || char === ']') {
+      depth = Math.max(0, depth - 1)
+      continue
+    }
+    if (char === '&' && depth === 0 && type[i - 1] !== '&' && type[i + 1] !== '&') {
+      parts.push(type.slice(start, i).trim())
+      start = i + 1
+    }
+  }
+
+  parts.push(type.slice(start).trim())
+  return parts.filter(Boolean)
+}
+
+function stripTypeComments(type: string): string {
+  let out = ''
+  let quote: string | null = null
+
+  for (let i = 0; i < type.length; i++) {
+    const char = type[i]
+    const next = type[i + 1]
+    if (quote) {
+      out += char
+      if (char === '\\') {
+        if (next) {
+          out += next
+          i++
+        }
+        continue
+      }
+      if (char === quote) quote = null
+      continue
+    }
+    if (char === '"' || char === "'" || char === '`') {
+      quote = char
+      out += char
+      continue
+    }
+    if (char === '/' && next === '/') {
+      while (i < type.length && type[i] !== '\n') i++
+      if (i < type.length) out += '\n'
+      continue
+    }
+    if (char === '/' && next === '*') {
+      i += 2
+      while (i < type.length && !(type[i] === '*' && type[i + 1] === '/')) i++
+      i++
+      continue
+    }
+    out += char
+  }
+
+  return out
+}
+
+function nextNonWhitespace(type: string, start: number): string | undefined {
+  for (let i = start; i < type.length; i++) {
+    const char = type[i]
+    if (char && !/\s/.test(char)) return char
+  }
+  return undefined
+}
+
 function splitTopLevelObjectEntries(type: string): string[] {
   const parts: string[] = []
   let depth = 0
@@ -115,7 +202,14 @@ function splitTopLevelObjectEntries(type: string): string[] {
       depth = Math.max(0, depth - 1)
       continue
     }
-    if ((char === ';' || char === ',') && depth === 0) {
+    if (
+      depth === 0 &&
+      (char === ';' ||
+        char === ',' ||
+        (char === '\n' &&
+          type.slice(start, i).includes(':') &&
+          !['|', '&'].includes(nextNonWhitespace(type, i + 1) ?? '')))
+    ) {
       parts.push(type.slice(start, i).trim())
       start = i + 1
     }
@@ -125,12 +219,35 @@ function splitTopLevelObjectEntries(type: string): string[] {
   return parts.filter(Boolean)
 }
 
+function parseInlineObjectEntries(type: string): string[] | null | undefined {
+  if (!type.startsWith('{') || !type.endsWith('}')) return undefined
+
+  const inner = type.slice(1, -1).trim()
+  if (!inner) return []
+
+  const entries: string[] = []
+  for (const part of splitTopLevelObjectEntries(inner)) {
+    const trimmed = part.trim().replace(/[;,]\s*$/, '')
+    if (!trimmed || trimmed.startsWith('[')) continue
+    const match = trimmed.match(/^(?:readonly\s+)?(\w+)(\?)?:\s*(.+)$/s)
+    if (!match) continue
+    const [, name, opt, typeStr] = match
+    const parsed = parseTypeString(typeStr!.trim())
+    if (!parsed) return null // can't resolve inner type
+    let val = parsed
+    if (opt) val = `v.optional(${val})`
+    entries.push(`${formatObjectKey(name!)}: ${val}`)
+  }
+
+  return entries
+}
+
 // simple string-based type parser for inline type annotations from source text.
 // handles: primitives, inline objects { ... }, arrays, void/null/unknown.
 // returns null for type references that cannot be resolved without a type
 // checker (bare identifiers, generics, imported aliases).
 export function parseTypeString(type: string): string | null {
-  type = type.trim()
+  type = stripTypeComments(type.trim()).trim()
 
   const unionParts = splitTopLevelTypeUnion(type)
   if (unionParts.length > 1) {
@@ -150,6 +267,18 @@ export function parseTypeString(type: string): string | null {
     return val
   }
 
+  const intersectionParts = splitTopLevelTypeIntersection(type)
+  if (intersectionParts.length > 1) {
+    const entries: string[] = []
+    for (const part of intersectionParts) {
+      const objectEntries = parseInlineObjectEntries(part)
+      if (!objectEntries) return null
+      entries.push(...objectEntries)
+    }
+    if (entries.length === 0) return 'v.object({})'
+    return `v.object({\n    ${entries.join(',\n    ')},\n  })`
+  }
+
   // primitives
   if (type === 'string') return 'v.string()'
   if (type === 'number') return 'v.number()'
@@ -159,25 +288,13 @@ export function parseTypeString(type: string): string | null {
   if (type === 'any' || type === 'unknown') return 'v.unknown()'
 
   // inline object: { key: type; ... }
-  if (type.startsWith('{') && type.endsWith('}')) {
-    const inner = type.slice(1, -1).trim()
-    if (!inner) return 'v.object({})'
-    const entries: string[] = []
-    for (const part of splitTopLevelObjectEntries(inner)) {
-      const trimmed = part.trim().replace(/[;,]\s*$/, '')
-      if (!trimmed) continue
-      const match = trimmed.match(/^(?:readonly\s+)?(\w+)(\?)?:\s*(.+)$/)
-      if (!match) continue
-      const [, name, opt, typeStr] = match
-      const parsed = parseTypeString(typeStr!.trim())
-      if (!parsed) return null // can't resolve inner type
-      let val = parsed
-      if (opt) val = `v.optional(${val})`
-      entries.push(`${formatObjectKey(name!)}: ${val}`)
-    }
+  const objectEntries = parseInlineObjectEntries(type)
+  if (objectEntries) {
+    const entries = objectEntries
     if (entries.length === 0) return 'v.object({})'
     return `v.object({\n    ${entries.join(',\n    ')},\n  })`
   }
+  if (objectEntries === null) return null
 
   // array: T[]
   if (type.endsWith('[]')) {
@@ -510,10 +627,14 @@ export function generateSyncedMutationsFile(modelMutations: ModelMutations[]): s
       for (const mut of model.custom) {
         if (model.hasCRUD && ['insert', 'update', 'delete', 'upsert'].includes(mut.name))
           continue
-        if (mut.paramType === 'void' || !mut.valibotCode) {
+        if (mut.paramType === 'void') {
           entries.push(`    ${mut.name}: v.void_(),`)
           continue
         }
+        if (!mut.valibotCode) {
+          entries.push(`    ${mut.name}: v.unknown(),`)
+          continue
+        }
         entries.push(`    ${mut.name}: ${extractValibotExpression(mut.valibotCode)},`)
       }
 

package/src/generate-lite.test.ts

@@ -99,6 +99,114 @@ describe('generateLite', () => {
     expect(result.mutationCount).toBe(3)
   })
 
+  test('parses newline-separated mutation object types', () => {
+    const files: Record<string, string> = {
+      [`${DIR}/models/agentEvent.ts`]: '// fake',
+      [`${DIR}/models/deployment.ts`]: '// fake',
+    }
+
+    const fixtures: Record<string, LiteParsedFile> = {
+      [`${DIR}/models/agentEvent.ts`]: {
+        mutations: [
+          {
+            modelName: 'agentEvent',
+            handlers: [
+              {
+                name: 'claimReviewLease',
+                paramTypeText: `{
+                  id: string
+                  projectId: string
+                  createdAt: number
+                }`,
+              },
+            ],
+            schema: null,
+          },
+        ],
+        queries: [],
+      },
+      [`${DIR}/models/deployment.ts`]: {
+        mutations: [
+          {
+            modelName: 'deployment',
+            handlers: [
+              {
+                name: 'deploy',
+                paramTypeText: `{
+                  id: string
+                  platform?: string // 'web' | 'ios'
+                  buildTier?: string // 'dev' | 'testflight' | 'production'
+                }`,
+              },
+            ],
+            schema: null,
+          },
+        ],
+        queries: [],
+      },
+    }
+
+    const result = generateLite({
+      files,
+      dir: DIR,
+      parse: makeParse(fixtures),
+    })
+
+    const synced = result.files['syncedMutations.ts']!
+    expect(synced).toContain('claimReviewLease:')
+    expect(synced).toContain('projectId: v.string()')
+    expect(synced).toContain('createdAt: v.number()')
+    expect(synced).toContain('deploy:')
+    expect(synced).toContain('platform: v.optional(v.string())')
+    expect(synced).toContain('buildTier: v.optional(v.string())')
+    expect(synced).not.toContain('claimReviewLease: v.object({})')
+    expect(synced).not.toContain('deploy: v.object({})')
+  })
+
+  test('parses object intersections and skips index signatures', () => {
+    const files: Record<string, string> = {
+      [`${DIR}/models/agent.ts`]: '// fake',
+    }
+
+    const fixtures: Record<string, LiteParsedFile> = {
+      [`${DIR}/models/agent.ts`]: {
+        mutations: [
+          {
+            modelName: 'agent',
+            handlers: [
+              {
+                name: 'update',
+                paramTypeText: `{
+                  id: string
+                } & {
+                  status?: string
+                  currentTaskId?: string
+                  [key: string]: unknown
+                }`,
+              },
+            ],
+            schema: null,
+          },
+        ],
+        queries: [],
+      },
+    }
+
+    const result = generateLite({
+      files,
+      dir: DIR,
+      parse: makeParse(fixtures),
+    })
+
+    const synced = result.files['syncedMutations.ts']!
+    expect(synced).toContain('update:')
+    expect(synced).toContain('id: v.string()')
+    expect(synced).toContain('status: v.optional(v.string())')
+    expect(synced).toContain('currentTaskId: v.optional(v.string())')
+    expect(synced).not.toContain('[key')
+    expect(synced).not.toContain('update: v.object({})')
+  })
+
   test('falls back to v.unknown() for type references', () => {
     const files: Record<string, string> = {
       [`${DIR}/models/post.ts`]: '// fake',
@@ -141,6 +249,33 @@ describe('generateLite', () => {
     expect(synced).toContain('publish: v.string()')
   })
 
+  test('uses v.unknown() for explicitly unknown mutation params', () => {
+    const files: Record<string, string> = {
+      [`${DIR}/models/project.ts`]: '// fake',
+    }
+
+    const fixtures: Record<string, LiteParsedFile> = {
+      [`${DIR}/models/project.ts`]: {
+        mutations: [
+          {
+            modelName: 'project',
+            handlers: [{ name: 'insert', paramTypeText: 'unknown' }],
+            schema: null,
+          },
+        ],
+        queries: [],
+      },
+    }
+
+    const result = generateLite({
+      files,
+      dir: DIR,
+      parse: makeParse(fixtures),
+    })
+
+    expect(result.files['syncedMutations.ts']!).toContain('insert: v.unknown()')
+  })
+
   test('emits query files with v.unknown() fallback for references', () => {
     const files: Record<string, string> = {
       [`${DIR}/models/post.ts`]: '// fake',

package/src/generate-lite.ts

@@ -209,8 +209,7 @@ export function generateLite(opts: LiteGenerateOptions): LiteGenerateResult {
 
       const paramType = h.paramTypeText.trim()
 
-      // unknown explicitly → no validator (becomes v.void_ in the emitter,
-      // matching the existing generator's behavior for 'unknown')
+      // unknown explicitly → permissive validator
       if (paramType === 'unknown') {
         return { name: h.name, paramType: 'unknown', valibotCode: '' }
       }

package/src/generate.test.ts

@@ -311,6 +311,102 @@ export const mutate = mutations({
     expect(content).toContain('v.string()')
   })
 
+  test('generates validators for string-model multiline mutation params', async () => {
+    writeFileSync(
+      join(testDir, 'models/agentEvent.ts'),
+      `
+import { mutations, serverWhere } from 'on-zero'
+
+const perm = serverWhere('agentEvent', () => true)
+
+export const mutate = mutations('agentEvent', perm, {
+  claimReviewLease: async (
+    { tx },
+    props: {
+      id: string
+      projectId: string
+      agentId: string
+      userId: string
+      taskId: string
+      reviewKey: string
+      runnerId: string
+      createdAt: number
+    },
+  ) => {
+    await tx.mutate.agentEvent.insert(props)
+  },
+})
+`,
+    )
+
+    await generate({ dir: testDir, silent: true })
+
+    const content = readFileSync(join(testDir, 'generated/syncedMutations.ts'), 'utf-8')
+    expect(content).toContain('claimReviewLease')
+    expect(content).toContain('projectId: v.string()')
+    expect(content).toContain('createdAt: v.number()')
+    expect(content).not.toContain('claimReviewLease: v.object({})')
+  })
+
+  test('generates validators for object intersections', async () => {
+    writeFileSync(
+      join(testDir, 'models/agent.ts'),
+      `
+import { mutations, serverWhere } from 'on-zero'
+
+const perm = serverWhere('agent', () => true)
+
+export const mutate = mutations('agent', perm, {
+  update: async (
+    { tx },
+    props: {
+      id: string
+    } & {
+      status?: string
+      currentTaskId?: string
+      [key: string]: unknown
+    },
+  ) => {
+    await tx.mutate.agent.update(props)
+  },
+})
+`,
+    )
+
+    await generate({ dir: testDir, silent: true })
+
+    const content = readFileSync(join(testDir, 'generated/syncedMutations.ts'), 'utf-8')
+    expect(content).toContain('update')
+    expect(content).toContain('id: v.string()')
+    expect(content).toContain('status: v.optional(v.string())')
+    expect(content).toContain('currentTaskId: v.optional(v.string())')
+    expect(content).not.toContain('update: v.object({})')
+    expect(content).not.toContain('[key')
+  })
+
+  test('uses v.unknown for untyped mutation payloads', async () => {
+    writeFileSync(
+      join(testDir, 'models/project.ts'),
+      `
+import { mutations, serverWhere } from 'on-zero'
+
+const perm = serverWhere('project', () => true)
+
+export const mutate = mutations('project', perm, {
+  insert: async ({ tx }, project) => {
+    await tx.mutate.project.insert(project)
+  },
+})
+`,
+    )
+
+    await generate({ dir: testDir, silent: true })
+
+    const content = readFileSync(join(testDir, 'generated/syncedMutations.ts'), 'utf-8')
+    expect(content).toContain('insert: v.unknown()')
+    expect(content).not.toContain('insert: v.void_()')
+  })
+
   test('handles mutations with only context param (void)', async () => {
     writeFileSync(
       join(testDir, 'models/user.ts'),

package/src/generate.ts

@@ -274,13 +274,21 @@ function extractMutationsFromModel(
 
   // determine overload
   // 1-arg: mutations({ ... })
-  // 2-arg: mutations(schema, perm)
-  // 3-arg: mutations(schema, perm, { ... })
-  const hasCRUD = args.length >= 2
+  // schema model: mutations(schema, perm) / mutations(schema, perm, { ... })
+  // named model: mutations('name', handlers) / mutations('name', perm, { ... })
+  const firstArg = args[0]
+  const hasNamedModel = Boolean(firstArg && ts.isStringLiteralLike(firstArg))
+  const hasCRUD = args.length >= 2 && !hasNamedModel
   let handlersArg: import('typescript').ObjectLiteralExpression | null = null
 
   if (args.length === 1 && ts.isObjectLiteralExpression(args[0]!)) {
     handlersArg = args[0] as import('typescript').ObjectLiteralExpression
+  } else if (hasNamedModel) {
+    if (args.length >= 3 && ts.isObjectLiteralExpression(args[2]!)) {
+      handlersArg = args[2] as import('typescript').ObjectLiteralExpression
+    } else if (args.length >= 2 && ts.isObjectLiteralExpression(args[1]!)) {
+      handlersArg = args[1] as import('typescript').ObjectLiteralExpression
+    }
   } else if (args.length === 3 && ts.isObjectLiteralExpression(args[2]!)) {
     handlersArg = args[2] as import('typescript').ObjectLiteralExpression
   }