Skip to content

fix: check for empty strings and escapement for ID formatting #542

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
ymc9 merged 2 commits into from
Dec 29, 2025
Merged

fix: check for empty strings and escapement for ID formatting #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1c0aa4
fix: do not accept empty strings, check for escapement
sanny-io Dec 28, 2025
e911b28
chore: add more edge cases, remove invalid test
sanny-io Dec 28, 2025
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
5 changes: 4 additions & 1 deletion packages/language/src/validators/function-invocation-validator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,10 @@ export default class FunctionInvocationValidator implements AstValidator<Express
if (['uuid', 'ulid', 'cuid', 'nanoid'].includes(funcDecl.name)) {
const formatParamIdx = funcDecl.params.findIndex(param => param.name === 'format');
const formatArg = getLiteral<string>(expr.args[formatParamIdx]?.value);
if (formatArg && !formatArg.includes('%s')) {
if (
formatArg !== undefined &&
!/(?<!\\)%s/g.test(formatArg) // an unescaped %s must be present
) {
accept('error', 'argument must include "%s"', {
node: expr.args[formatParamIdx]!,
});
Expand Down
61 changes: 61 additions & 0 deletions packages/language/test/function-invocation.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,70 @@ describe('Function Invocation Tests', () => {
}
`,
);

await loadSchema(
`
datasource db {
provider = 'sqlite'
url = 'file:./dev.db'
}

model User {
id String @id @default(uuid(7, '\\\\%s_%s'))
}
`,
);

await loadSchema(
`
datasource db {
provider = 'sqlite'
url = 'file:./dev.db'
}

model User {
id String @id @default(uuid(7, '%s_\\\\%s'))
}
`,
);
});

it('id functions should reject invalid format strings', async () => {
await loadSchemaWithError(`
datasource db {
provider = 'sqlite'
url = 'file:./dev.db'
}

model User {
id String @id @default(cuid(2, ''))
}
`, 'argument must include');

await loadSchemaWithError(
`
datasource db {
provider = 'sqlite'
url = 'file:./dev.db'
}

model User {
id String @id @default(uuid(4, '\\\\%s'))
}
`, 'argument must include');

await loadSchemaWithError(
`
datasource db {
provider = 'sqlite'
url = 'file:./dev.db'
}

model User {
id String @id @default(uuid(4, '\\\\%s\\\\%s'))
}
`, 'argument must include');

await loadSchemaWithError(
`
datasource db {
Expand Down
12 changes: 8 additions & 4 deletions tests/e2e/orm/client-api/generated-id-format-strings.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,10 @@ describe('generated id format strings', () => {
const escapedSchema = `
model EscapedTest {
id Int @id
escaped String @default(uuid(4, "prefix_\\\\%s_suffix"))
consecutive String @default(uuid(4, "%s%s"))
mixedEscaped String @default(uuid(4, "\\\\%s_%s_end"))
mixedEscaped2 String @default(uuid(4, "%s_\\\\%s_end"))
mixedEscaped3 String @default(uuid(4, "\\\\%s_\\\\%s_%s"))
startWithPattern String @default(uuid(4, "%s_suffix"))
endWithPattern String @default(uuid(4, "prefix_%s"))
}
Expand All @@ -158,15 +159,18 @@ model EscapedTest {
},
});

// Escaped \%s should become literal %s in output
expect(record.escaped).toMatch(/^prefix_%s_suffix$/);

// Consecutive %s%s should both be replaced
expect(record.consecutive).toMatch(/^[0-9a-f-]{36}[0-9a-f-]{36}$/);

// Mixed: first \%s stays as %s, second %s is replaced
expect(record.mixedEscaped).toMatch(/^%s_[0-9a-f-]{36}_end$/);

// Mixed: first %s is replaced, second \%s stays as %s
expect(record.mixedEscaped2).toMatch(/^[0-9a-f-]{36}_%s_end$/);

// Mixed: first and second \%s stays as %s, third %s is replaced
expect(record.mixedEscaped3).toMatch(/^%s_%s_[0-9a-f-]{36}$/);

// Pattern at start
expect(record.startWithPattern).toMatch(/^[0-9a-f-]{36}_suffix$/);

Expand Down
Loading