Skip to content

feat: enum name mapping support and several fixes about postgres default schema #391

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
merged 4 commits into from
Nov 12, 2025
Merged

feat: enum name mapping support and several fixes about postgres default schema #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a2ad5e5
fix: stricter default schema validation and proper transformation to …
ymc9 Nov 10, 2025
2561442
feat(orm): support enum name mappings
ymc9 Nov 12, 2025
1be90f8
Merge remote-tracking branch 'origin/dev' into feat/enum-mapping
ymc9 Nov 12, 2025
66ae12a
fix db pusher
ymc9 Nov 12, 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
4 changes: 2 additions & 2 deletions packages/language/res/stdlib.zmodel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,9 +457,9 @@ attribute @db.ByteA() @@@targetField([BytesField]) @@@prisma
/**
* Specifies the schema to use in a multi-schema PostgreSQL database.
*
* @param name: The name of the database schema.
* @param map: The name of the database schema.
*/
attribute @@schema(_ name: String) @@@prisma
attribute @@schema(_ map: String) @@@prisma

//////////////////////////////////////////////
// Begin validation attributes and functions
Expand Down
59 changes: 38 additions & 21 deletions packages/orm/src/client/crud/validator/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@ import {
type UpdateManyArgs,
type UpsertArgs,
} from '../../crud-types';
import { createInternalError, createInvalidInputError } from '../../errors';
import {
fieldHasDefaultValue,
getDiscriminatorField,
getEnum,
getTypeDef,
getUniqueFields,
requireField,
requireModel,
Expand All @@ -47,7 +49,6 @@ import {
addNumberValidation,
addStringValidation,
} from './utils';
import { createInternalError, createInvalidInputError } from '../../errors';

const schemaCache = new WeakMap<SchemaDef, Map<string, ZodType>>();

Expand Down Expand Up @@ -281,6 +282,8 @@ export class InputValidator<Schema extends SchemaDef> {
private makePrimitiveSchema(type: string, attributes?: AttributeApplication[]) {
if (this.schema.typeDefs && type in this.schema.typeDefs) {
return this.makeTypeDefSchema(type);
} else if (this.schema.enums && type in this.schema.enums) {
return this.makeEnumSchema(type);
} else {
return match(type)
.with('String', () =>
Expand Down Expand Up @@ -314,6 +317,22 @@ export class InputValidator<Schema extends SchemaDef> {
}
}

private makeEnumSchema(type: string) {
const key = stableStringify({
type: 'enum',
name: type,
});
let schema = this.getSchemaCache(key!);
if (schema) {
return schema;
}
const enumDef = getEnum(this.schema, type);
invariant(enumDef, `Enum "${type}" not found in schema`);
schema = z.enum(Object.keys(enumDef.values) as [string, ...string[]]);
this.setSchemaCache(key!, schema);
return schema;
}

private makeTypeDefSchema(type: string): z.ZodType {
const key = stableStringify({
type: 'typedef',
Expand All @@ -324,24 +343,22 @@ export class InputValidator<Schema extends SchemaDef> {
if (schema) {
return schema;
}
const typeDef = this.schema.typeDefs?.[type];
const typeDef = getTypeDef(this.schema, type);
invariant(typeDef, `Type definition "${type}" not found in schema`);
schema = z
.object(
Object.fromEntries(
Object.entries(typeDef.fields).map(([field, def]) => {
let fieldSchema = this.makePrimitiveSchema(def.type);
if (def.array) {
fieldSchema = fieldSchema.array();
}
if (def.optional) {
fieldSchema = fieldSchema.optional();
}
return [field, fieldSchema];
}),
),
)
.passthrough();
schema = z.looseObject(
Object.fromEntries(
Object.entries(typeDef.fields).map(([field, def]) => {
let fieldSchema = this.makePrimitiveSchema(def.type);
if (def.array) {
fieldSchema = fieldSchema.array();
}
if (def.optional) {
fieldSchema = fieldSchema.optional();
}
return [field, fieldSchema];
}),
),
);
this.setSchemaCache(key!, schema);
return schema;
}
Expand Down Expand Up @@ -392,7 +409,7 @@ export class InputValidator<Schema extends SchemaDef> {
const enumDef = getEnum(this.schema, fieldDef.type);
if (enumDef) {
// enum
if (Object.keys(enumDef).length > 0) {
if (Object.keys(enumDef.values).length > 0) {
fieldSchema = this.makeEnumFilterSchema(enumDef, !!fieldDef.optional, withAggregations);
}
} else if (fieldDef.array) {
Expand Down Expand Up @@ -427,7 +444,7 @@ export class InputValidator<Schema extends SchemaDef> {
const enumDef = getEnum(this.schema, def.type);
if (enumDef) {
// enum
if (Object.keys(enumDef).length > 0) {
if (Object.keys(enumDef.values).length > 0) {
fieldSchema = this.makeEnumFilterSchema(enumDef, !!def.optional, false);
} else {
fieldSchema = z.never();
Expand Down Expand Up @@ -493,7 +510,7 @@ export class InputValidator<Schema extends SchemaDef> {
}

private makeEnumFilterSchema(enumDef: EnumDef, optional: boolean, withAggregations: boolean) {
const baseSchema = z.enum(Object.keys(enumDef) as [string, ...string[]]);
const baseSchema = z.enum(Object.keys(enumDef.values) as [string, ...string[]]);
const components = this.makeCommonPrimitiveFilterComponents(
baseSchema,
optional,
Expand Down
Loading