Skip to content

fix(wabe): codegen for file fields #325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
coratgerl merged 1 commit into from
Apr 19, 2026
Merged

fix(wabe): codegen for file fields #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 10 additions & 20 deletions packages/wabe/src/server/generateCodegen.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,30 +66,20 @@ describe('Format helpers', () => {
})

describe('getFileOutputTypeString', () => {
it('should use comma separator by default', () => {
it('should use semicolon separators for inline object members', () => {
expect(getFileOutputTypeString()).toBe(
'{ name: string, url?: string, urlGeneratedAt?: string, isPresignedUrl: boolean }',
)
})

it('should use semicolon separator when semi is true', () => {
expect(getFileOutputTypeString({ semi: true })).toBe(
'{ name: string; url?: string; urlGeneratedAt?: string; isPresignedUrl: boolean }',
)
expect(getFileOutputTypeString({ semi: true })).toBe(getFileOutputTypeString())
})
})

describe('getFileInputTypeString', () => {
it('should return an XOR union (file | url+name) with comma separator by default', () => {
it('should return an XOR union (file | url+name) with semicolon separators', () => {
expect(getFileInputTypeString()).toBe(
'{ file: File, url?: never, name?: never } | { file?: never, url: string, name: string }',
)
})

it('should return an XOR union (file | url+name) with semicolon separator when semi is true', () => {
expect(getFileInputTypeString({ semi: true })).toBe(
'{ file: File; url?: never; name?: never } | { file?: never; url: string; name: string }',
)
expect(getFileInputTypeString({ semi: true })).toBe(getFileInputTypeString())
})
})

Expand Down Expand Up @@ -131,11 +121,11 @@ describe('wabeTypesToTypescriptTypes', () => {

it('should return File output type object by default', () => {
expect(wabeTypesToTypescriptTypes({ field: mkField({ type: 'File' }) })).toBe(
'{ name: string, url?: string, urlGeneratedAt?: string, isPresignedUrl: boolean }',
'{ name: string; url?: string; urlGeneratedAt?: string; isPresignedUrl: boolean }',
)
})

it('should return File output type with semi format', () => {
it('should return File output type with same inline separators when semi is set on formatOptions', () => {
expect(
wabeTypesToTypescriptTypes({
field: mkField({ type: 'File' }),
Expand All @@ -151,11 +141,11 @@ describe('wabeTypesToTypescriptTypes', () => {
isInput: true,
}),
).toBe(
'{ file: File, url?: never, name?: never } | { file?: never, url: string, name: string }',
'{ file: File; url?: never; name?: never } | { file?: never; url: string; name: string }',
)
})

it('should return File input type with semi format when isInput', () => {
it('should return File input type with same inline separators when isInput and semi formatOptions', () => {
expect(
wabeTypesToTypescriptTypes({
field: mkField({ type: 'File' }),
Expand Down Expand Up @@ -199,7 +189,7 @@ describe('wabeTypesToTypescriptTypes', () => {
field: mkField({ type: 'Array', typeValue: 'File' }),
}),
).toBe(
'Array<{ name: string, url?: string, urlGeneratedAt?: string, isPresignedUrl: boolean }>',
'Array<{ name: string; url?: string; urlGeneratedAt?: string; isPresignedUrl: boolean }>',
)
})

Expand All @@ -210,7 +200,7 @@ describe('wabeTypesToTypescriptTypes', () => {
isInput: true,
}),
).toBe(
'Array<{ file: File, url?: never, name?: never } | { file?: never, url: string, name: string }>',
'Array<{ file: File; url?: never; name?: never } | { file?: never; url: string; name: string }>',
)
})

Expand Down
14 changes: 6 additions & 8 deletions packages/wabe/src/server/generateCodegen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,13 @@ export const getEndChar = (options?: CodegenFormatOptions): string =>
export const getQuoteChar = (options?: CodegenFormatOptions): string =>
options?.quote === 'double' ? '"' : "'"

export const getFileOutputTypeString = (options?: CodegenFormatOptions) => {
const sep = options?.semi ? '; ' : ', '
return `{ name: string${sep}url?: string${sep}urlGeneratedAt?: string${sep}isPresignedUrl: boolean }`
}
const inlineObjectTypeMemberSep = '; '

export const getFileInputTypeString = (options?: CodegenFormatOptions) => {
const sep = options?.semi ? '; ' : ', '
return `{ file: File${sep}url?: never${sep}name?: never } | { file?: never${sep}url: string${sep}name: string }`
}
export const getFileOutputTypeString = (_options?: CodegenFormatOptions) =>
`{ name: string${inlineObjectTypeMemberSep}url?: string${inlineObjectTypeMemberSep}urlGeneratedAt?: string${inlineObjectTypeMemberSep}isPresignedUrl: boolean }`

export const getFileInputTypeString = (_options?: CodegenFormatOptions) =>
`{ file: File${inlineObjectTypeMemberSep}url?: never${inlineObjectTypeMemberSep}name?: never } | { file?: never${inlineObjectTypeMemberSep}url: string${inlineObjectTypeMemberSep}name: string }`

export const getFileTypeString = (options?: CodegenFormatOptions, isInput = false) =>
isInput ? getFileInputTypeString(options) : getFileOutputTypeString(options)
Expand Down
Loading