on-zero 0.1.45 → 0.1.47

package/src/generate.test.ts

@@ -270,7 +270,7 @@ export const mutate = mutations(schema, perm)
     expect(content).toContain('delete:')
   })
 
-  test('skips models without export const mutate', async () => {
+  test('treats models without export const mutate as empty mutations', async () => {
     writeFileSync(
       join(testDir, 'models/readonly.ts'),
       `
@@ -285,6 +285,9 @@ export const schema = table('readonly').columns({
 
     const result = await generate({ dir: testDir, silent: true })
     expect(result.mutationCount).toBe(0)
+
+    const content = readFileSync(join(testDir, 'generated/syncedMutations.ts'), 'utf-8')
+    expect(content).toContain('readonly: {')
   })
 
   test('extracts custom mutations from bare mutations({})', async () => {
@@ -505,6 +508,39 @@ export const mutate = mutations(schema, perm, {
     expect(content).not.toMatch(/rename:[\s\S]*count/)
   })
 
+  test('skips symbol-keyed properties when resolving imported mutation param types', async () => {
+    writeFileSync(
+      join(testDir, 'models/types.ts'),
+      `
+export type WeirdParams = {
+  id: string
+  [Symbol.iterator]?: () => Iterator<string>
+}
+`
+    )
+
+    writeFileSync(
+      join(testDir, 'models/item.ts'),
+      `
+import { mutations } from 'on-zero'
+import type { WeirdParams } from './types'
+
+export const mutate = mutations({
+  run: async ({ tx }, params: WeirdParams) => {
+    await tx.mutate.item.delete({ id: params.id })
+  },
+})
+`
+    )
+
+    await generate({ dir: testDir, silent: true })
+
+    const content = readFileSync(join(testDir, 'generated/syncedMutations.ts'), 'utf-8')
+    expect(content).toContain('run')
+    expect(content).toContain('id: v.string()')
+    expect(content).not.toContain('__@iterator')
+  })
+
   test('resolves imported types in query params', async () => {
     writeFileSync(
       join(testDir, 'models/post.ts'),

package/src/generate.ts

@@ -430,7 +430,7 @@ function extractMutationsFromModel(
   ts: typeof import('typescript'),
   sourceFile: ReturnType<typeof ts.createSourceFile>,
   content: string,
-  _fileName: string,
+  fileName: string,
   silent: boolean,
   typeToValibot: (typeString: string) => string | null,
   resolvedTypes?: Map<string, import('typescript').Type>,
@@ -450,7 +450,15 @@ function extractMutationsFromModel(
     }
   })
 
-  if (!mutateNode) return null
+  if (!mutateNode) {
+    return {
+      modelName: basename(fileName, '.ts'),
+      hasCRUD: false,
+      columns: {},
+      primaryKeys: [],
+      custom: [],
+    }
+  }
 
   const call = mutateNode as import('typescript').CallExpression
   const args = call.arguments
@@ -621,6 +629,16 @@ function columnTypeToValibot(col: SchemaColumn): string {
   return col.optional ? `v.optional(v.nullable(${base}))` : base
 }
 
+function shouldSkipObjectKey(name: string): boolean {
+  // TypeScript exposes symbol keys as synthetic names like "__@iterator@851".
+  // These cannot come from JSON mutation payloads and break codegen if emitted.
+  return name.startsWith('__@')
+}
+
+function formatObjectKey(name: string): string {
+  return /^[$A-Z_a-z][$\w]*$/.test(name) ? name : JSON.stringify(name)
+}
+
 function schemaColumnsToValibot(
   columns: Record<string, SchemaColumn>,
   primaryKeys: string[],
@@ -632,22 +650,29 @@ function schemaColumnsToValibot(
     // only PKs
     for (const pk of primaryKeys) {
       const col = columns[pk]
-      if (col) entries.push(`${pk}: ${columnTypeToValibot({ ...col, optional: false })}`)
+      if (col)
+        entries.push(
+          `${formatObjectKey(pk)}: ${columnTypeToValibot({ ...col, optional: false })}`
+        )
     }
   } else if (mode === 'update') {
     // PKs required, rest optional
     for (const [name, col] of Object.entries(columns)) {
       const isPK = primaryKeys.includes(name)
       if (isPK) {
-        entries.push(`${name}: ${columnTypeToValibot({ ...col, optional: false })}`)
+        entries.push(
+          `${formatObjectKey(name)}: ${columnTypeToValibot({ ...col, optional: false })}`
+        )
       } else {
-        entries.push(`${name}: ${columnTypeToValibot({ ...col, optional: true })}`)
+        entries.push(
+          `${formatObjectKey(name)}: ${columnTypeToValibot({ ...col, optional: true })}`
+        )
       }
     }
   } else {
     // insert: all columns as-is
     for (const [name, col] of Object.entries(columns)) {
-      entries.push(`${name}: ${columnTypeToValibot(col)}`)
+      entries.push(`${formatObjectKey(name)}: ${columnTypeToValibot(col)}`)
     }
   }
 
@@ -750,7 +775,7 @@ function parseTypeString(type: string): string | null {
       if (!parsed) return null // can't resolve inner type
       let val = parsed
       if (opt) val = `v.optional(${val})`
-      entries.push(`${name}: ${val}`)
+      entries.push(`${formatObjectKey(name)}: ${val}`)
     }
     if (entries.length === 0) return 'v.object({})'
     return `v.object({\n    ${entries.join(',\n    ')},\n  })`
@@ -853,14 +878,17 @@ function tsTypeToValibot(
     if (props.length === 0) return 'v.object({})'
     const entries: string[] = []
     for (const prop of props) {
+      const name = prop.getName()
+      if (shouldSkipObjectKey(name)) continue
       const propType = resolveSymbolType(prop)
       const isOptional = !!(prop.getFlags() & ts.SymbolFlags.Optional)
       let val = recurse(propType)
       if (isOptional && !val.startsWith('v.optional(')) {
         val = `v.optional(${val})`
       }
-      entries.push(`${prop.getName()}: ${val}`)
+      entries.push(`${formatObjectKey(name)}: ${val}`)
     }
+    if (entries.length === 0) return 'v.object({})'
     return `v.object({\n    ${entries.join(',\n    ')},\n  })`
   }
 
@@ -895,13 +923,15 @@ function tsTypeToValibot(
     // regular object
     const entries: string[] = []
     for (const prop of props) {
+      const name = prop.getName()
+      if (shouldSkipObjectKey(name)) continue
       const propType = resolveSymbolType(prop)
       const isOptional = !!(prop.getFlags() & ts.SymbolFlags.Optional)
       let val = recurse(propType)
       if (isOptional && !val.startsWith('v.optional(')) {
         val = `v.optional(${val})`
       }
-      entries.push(`${prop.getName()}: ${val}`)
+      entries.push(`${formatObjectKey(name)}: ${val}`)
     }
     if (entries.length === 0) return 'v.object({})'
     return `v.object({\n    ${entries.join(',\n    ')},\n  })`
@@ -1124,7 +1154,6 @@ export async function generate(options: GenerateOptions): Promise<GenerateResult
 
     try {
       const content = readFileSync(filePath, 'utf-8')
-      if (!content.includes('export const mutate')) continue
 
       mutationFiles.push({ path: filePath, content, baseName: fileBaseName })
 

package/src/mutations.ts

@@ -1,3 +1,4 @@
+import { isServer } from './constants'
 import { getDidRunPermissionCheck } from './helpers/didRunPermissionCheck'
 import { setMutationsPermissions } from './modelRegistry'
 
@@ -143,7 +144,7 @@ export function mutations<
           }
 
           // only validate on the server
-          if (process.env.VITE_ENVIRONMENT === 'ssr') {
+          if (isServer) {
             await ctx.can(permissions, obj)
           }
         }

package/types/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,QAAQ,SAAgC,CAAA;AACrD,eAAO,MAAM,SAAS,SAAY,CAAA"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,QAAQ,SAE6C,CAAA;AAElE,eAAO,MAAM,SAAS,SAAY,CAAA"}

package/types/constants.native.d.ts

@@ -1,3 +1,3 @@
 export declare const isServer = false;
-export declare const isBrowser = false;
+export declare const isBrowser = true;
 //# sourceMappingURL=constants.native.d.ts.map

package/types/constants.native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.native.d.ts","sourceRoot":"","sources":["../src/constants.native.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,QAAQ,QAAQ,CAAA;AAC7B,eAAO,MAAM,SAAS,QAAQ,CAAA"}
+{"version":3,"file":"constants.native.d.ts","sourceRoot":"","sources":["../src/constants.native.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,QAAQ,QAAQ,CAAA;AAC7B,eAAO,MAAM,SAAS,OAAO,CAAA"}

package/types/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"AA05BA,MAAM,WAAW,eAAe;IAC9B,0BAA0B;IAC1B,GAAG,EAAE,MAAM,CAAA;IACX,2BAA2B;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,sBAAsB;IACtB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB;AAED,MAAM,WAAW,YAAa,SAAQ,eAAe;IACnD,2BAA2B;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,EAAE,MAAM,CAAA;CACtB;AAED,wBAAsB,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CAoUhF;AAED,wBAAsB,KAAK,CAAC,OAAO,EAAE,YAAY,yCAkChD"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"AAw7BA,MAAM,WAAW,eAAe;IAC9B,0BAA0B;IAC1B,GAAG,EAAE,MAAM,CAAA;IACX,2BAA2B;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,sBAAsB;IACtB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB;AAED,MAAM,WAAW,YAAa,SAAQ,eAAe;IACnD,2BAA2B;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,EAAE,MAAM,CAAA;CACtB;AAED,wBAAsB,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CAmUhF;AAED,wBAAsB,KAAK,CAAC,OAAO,EAAE,YAAY,yCAkChD"}

package/types/mutations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mutations.d.ts","sourceRoot":"","sources":["../src/mutations.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,cAAc,EACd,cAAc,EAEd,cAAc,EACd,KAAK,EACN,MAAM,SAAS,CAAA;AAChB,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AA2D7D,KAAK,eAAe,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AACnF,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;AAevD,KAAK,YAAY,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAA;AAEhD,KAAK,aAAa,CAAC,KAAK,SAAS,YAAY,IAAI;IAC/C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;CAC/C,CAAA;AAED,KAAK,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAA;AAE1D,KAAK,iBAAiB,CAAC,KAAK,SAAS,YAAY,EAAE,SAAS,SAAS,gBAAgB,IAAI;KACtF,GAAG,IAAI,SAAS,GAAG,MAAM,SAAS,GAAG,GAAG,SAAS,MAAM,SAAS,GAC7D,SAAS,CAAC,GAAG,CAAC,GACd,GAAG,SAAS,MAAM,aAAa,CAAC,GAAG,CAAC,GAClC,aAAa,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,GACzB,KAAK;CACZ,CAAA;AAED,wBAAgB,SAAS,CAAC,SAAS,SAAS,gBAAgB,EAC1D,SAAS,EAAE,SAAS,GACnB,SAAS,CAAA;AACZ,wBAAgB,SAAS,CAAC,KAAK,SAAS,YAAY,EAAE,WAAW,SAAS,KAAK,EAC7E,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,WAAW,GACvB,iBAAiB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;AAC/B,wBAAgB,SAAS,CACvB,KAAK,SAAS,YAAY,EAC1B,WAAW,SAAS,KAAK,EACzB,SAAS,SAAS,gBAAgB,EAElC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,GACnB,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA"}
+{"version":3,"file":"mutations.d.ts","sourceRoot":"","sources":["../src/mutations.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,cAAc,EACd,cAAc,EAEd,cAAc,EACd,KAAK,EACN,MAAM,SAAS,CAAA;AAChB,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AA2D7D,KAAK,eAAe,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,cAAc,EAAE,GAAG,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AACnF,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;AAevD,KAAK,YAAY,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAA;AAEhD,KAAK,aAAa,CAAC,KAAK,SAAS,YAAY,IAAI;IAC/C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;IAC9C,MAAM,EAAE,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAA;CAC/C,CAAA;AAED,KAAK,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAA;AAE1D,KAAK,iBAAiB,CAAC,KAAK,SAAS,YAAY,EAAE,SAAS,SAAS,gBAAgB,IAAI;KACtF,GAAG,IAAI,SAAS,GAAG,MAAM,SAAS,GAAG,GAAG,SAAS,MAAM,SAAS,GAC7D,SAAS,CAAC,GAAG,CAAC,GACd,GAAG,SAAS,MAAM,aAAa,CAAC,GAAG,CAAC,GAClC,aAAa,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,GACzB,KAAK;CACZ,CAAA;AAED,wBAAgB,SAAS,CAAC,SAAS,SAAS,gBAAgB,EAC1D,SAAS,EAAE,SAAS,GACnB,SAAS,CAAA;AACZ,wBAAgB,SAAS,CAAC,KAAK,SAAS,YAAY,EAAE,WAAW,SAAS,KAAK,EAC7E,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,WAAW,GACvB,iBAAiB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;AAC/B,wBAAgB,SAAS,CACvB,KAAK,SAAS,YAAY,EAC1B,WAAW,SAAS,KAAK,EACzB,SAAS,SAAS,gBAAgB,EAElC,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,GACnB,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA"}

package/types/state.d.ts

@@ -5,6 +5,6 @@ export declare const getSchema: () => Schema;
 export declare const setSchema: (_: Schema) => void;
 export declare const getAuthData: () => {} | null;
 export declare const setAuthData: (_: AuthData) => void;
-export declare const getEnvironment: () => "server" | "client" | null;
+export declare const getEnvironment: () => "client" | "server" | null;
 export declare const setEnvironment: (env: "client" | "server") => void;
 //# sourceMappingURL=state.d.ts.map