@zenstackhq/better-auth 3.6.2 → 3.6.3-beta.1

package/dist/schema-generator.mjs

@@ -0,0 +1,373 @@
+import { lowerCaseFirst, upperCaseFirst } from "@zenstackhq/common-helpers";
+import { ZModelCodeGenerator, formatDocument, loadDocument } from "@zenstackhq/language";
+import { isDataModel } from "@zenstackhq/language/ast";
+import { hasAttribute } from "@zenstackhq/language/utils";
+import "better-auth";
+import fs from "node:fs";
+import { match } from "ts-pattern";
+//#region src/schema-generator.ts
+async function generateSchema(file, tables, config, options) {
+	let filePath = file;
+	if (!filePath) if (fs.existsSync("./schema.zmodel")) filePath = "./schema.zmodel";
+	else filePath = "./zenstack/schema.zmodel";
+	const schemaExists = fs.existsSync(filePath);
+	const schema = await updateSchema(filePath, tables, config, options);
+	return {
+		code: schema ?? "",
+		path: filePath,
+		overwrite: schemaExists && !!schema
+	};
+}
+async function updateSchema(schemaPath, tables, config, options) {
+	let zmodel;
+	if (fs.existsSync(schemaPath)) {
+		const loadResult = await loadDocument(schemaPath);
+		if (!loadResult.success) throw new Error(`Failed to load existing schema at ${schemaPath}: ${loadResult.errors.join(", ")}`);
+		zmodel = loadResult.model;
+	} else zmodel = initializeZmodel(config);
+	const toManyRelations = /* @__PURE__ */ new Map();
+	for (const [tableName, table] of Object.entries(tables)) {
+		const fields = tables[tableName]?.fields;
+		for (const field in fields) {
+			const attr = fields[field];
+			if (attr.references) {
+				const referencedOriginalModel = attr.references.model;
+				const referencedModelNameCap = upperCaseFirst(tables[referencedOriginalModel]?.modelName || referencedOriginalModel);
+				if (!toManyRelations.has(referencedModelNameCap)) toManyRelations.set(referencedModelNameCap, /* @__PURE__ */ new Set());
+				const currentModelNameCap = upperCaseFirst(table.modelName ?? tableName);
+				toManyRelations.get(referencedModelNameCap).add(currentModelNameCap);
+			}
+		}
+	}
+	let changed = false;
+	for (const [name, table] of Object.entries(tables)) {
+		const c = addOrUpdateModel(name, table, zmodel, tables, toManyRelations, !!options.advanced?.database?.useNumberId);
+		changed = changed || c;
+	}
+	if (!changed) return;
+	let content = new ZModelCodeGenerator().generate(zmodel);
+	try {
+		content = await formatDocument(content);
+	} catch {}
+	return content;
+}
+function addDefaultNow(df) {
+	const nowArg = { $type: "AttributeArg" };
+	nowArg.value = {
+		$type: "InvocationExpr",
+		function: { $refText: "now" },
+		args: [],
+		$container: nowArg
+	};
+	addFieldAttribute(df, "@default", [nowArg]);
+}
+function createDataModel(modelName, zmodel, numericId) {
+	const dataModel = {
+		$type: "DataModel",
+		name: modelName,
+		fields: [],
+		attributes: [],
+		mixins: [],
+		comments: [],
+		isView: false,
+		$container: zmodel
+	};
+	let idField;
+	if (numericId) idField = addModelField(dataModel, "id", "Int", false, false);
+	else idField = addModelField(dataModel, "id", "String", false, false);
+	addFieldAttribute(idField, "@id");
+	return dataModel;
+}
+function addModelField(dataModel, fieldName, fieldType, array, optional) {
+	const field = {
+		$type: "DataField",
+		name: fieldName,
+		attributes: [],
+		comments: [],
+		$container: dataModel
+	};
+	field.type = {
+		$type: "DataFieldType",
+		type: fieldType,
+		array,
+		optional,
+		$container: field
+	};
+	dataModel.fields.push(field);
+	return field;
+}
+function initializeZmodel(config) {
+	const zmodel = {
+		$type: "Model",
+		declarations: [],
+		imports: []
+	};
+	const ds = {
+		$type: "DataSource",
+		name: "db",
+		fields: [],
+		$container: zmodel
+	};
+	zmodel.declarations.push(ds);
+	const providerField = {
+		$type: "ConfigField",
+		name: "provider",
+		$container: ds
+	};
+	providerField.value = {
+		$type: "StringLiteral",
+		value: config.provider,
+		$container: providerField
+	};
+	const urlField = {
+		$type: "ConfigField",
+		name: "url",
+		$container: ds
+	};
+	const envCall = {
+		$type: "InvocationExpr",
+		function: { $refText: "env" },
+		args: [],
+		$container: urlField
+	};
+	const dbUrlArg = { $type: "Argument" };
+	dbUrlArg.value = {
+		$type: "StringLiteral",
+		value: "DATABASE_URL",
+		$container: dbUrlArg
+	};
+	envCall.args = [dbUrlArg];
+	urlField.value = config.provider === "sqlite" ? {
+		$type: "StringLiteral",
+		value: "file:./dev.db",
+		$container: urlField
+	} : envCall;
+	ds.fields.push(providerField);
+	ds.fields.push(urlField);
+	return zmodel;
+}
+function getMappedFieldType({ bigint, type }) {
+	return match(type).with("string", () => ({ type: "String" })).with("number", () => bigint ? { type: "BigInt" } : { type: "Int" }).with("boolean", () => ({ type: "Boolean" })).with("date", () => ({ type: "DateTime" })).with("json", () => ({ type: "Json" })).with("string[]", () => ({
+		type: "String",
+		array: true
+	})).with("number[]", () => ({
+		type: "Int",
+		array: true
+	})).when((v) => Array.isArray(v) && v.every((e) => typeof e === "string"), () => {
+		return { type: "String" };
+	}).otherwise(() => {
+		throw new Error(`Unsupported field type: ${type}`);
+	});
+}
+function addOrUpdateModel(tableName, table, zmodel, tables, toManyRelations, numericId) {
+	let changed = false;
+	const modelName = upperCaseFirst(tables[tableName]?.modelName ?? tableName);
+	let dataModel = zmodel.declarations.find((d) => isDataModel(d) && d.name === modelName);
+	if (!dataModel) {
+		changed = true;
+		dataModel = createDataModel(modelName, zmodel, numericId);
+		zmodel.declarations.push(dataModel);
+	}
+	if (modelName !== tableName && !hasAttribute(dataModel, "@@map")) addModelAttribute(dataModel, "@@map", [createStringAttributeArg(tableName)]);
+	for (const [fName, field] of Object.entries(table.fields)) {
+		const fieldName = field.fieldName ?? fName;
+		if (dataModel.fields.some((f) => f.name === fieldName)) continue;
+		changed = true;
+		if (!field.references) {
+			const { array, type } = getMappedFieldType(field);
+			const df = {
+				$type: "DataField",
+				name: fieldName,
+				attributes: [],
+				comments: [],
+				$container: dataModel
+			};
+			df.type = {
+				$type: "DataFieldType",
+				type,
+				array: !!array,
+				optional: !field.required,
+				$container: df
+			};
+			dataModel.fields.push(df);
+			if (fieldName === "id") addFieldAttribute(df, "@id");
+			if (field.unique) addFieldAttribute(df, "@unique");
+			if (field.defaultValue !== void 0) {
+				if (fieldName === "createdAt") addDefaultNow(df);
+				else if (typeof field.defaultValue === "boolean") addFieldAttribute(df, "@default", [createBooleanAttributeArg(field.defaultValue)]);
+				else if (typeof field.defaultValue === "string") addFieldAttribute(df, "@default", [createStringAttributeArg(field.defaultValue)]);
+				else if (typeof field.defaultValue === "number") addFieldAttribute(df, "@default", [createNumberAttributeArg(field.defaultValue)]);
+				else if (typeof field.defaultValue === "function") if (field.defaultValue() instanceof Date) addDefaultNow(df);
+				else console.warn(`Warning: Unsupported default function for field ${fieldName} in model ${table.modelName}. Please adjust manually.`);
+			}
+			if (fieldName === "updatedAt" && field.onUpdate) addFieldAttribute(df, "@updatedAt");
+			else if (field.onUpdate) console.warn(`Warning: 'onUpdate' is only supported on 'updatedAt' fields. Please adjust manually for field ${fieldName} in model ${table.modelName}.`);
+		} else {
+			addModelField(dataModel, fieldName, numericId ? "Int" : "String", false, !field.required);
+			const referencedOriginalModelName = field.references.model;
+			const referencedCustomModelName = tables[referencedOriginalModelName]?.modelName || referencedOriginalModelName;
+			const relationField = {
+				$type: "DataField",
+				name: lowerCaseFirst(referencedCustomModelName),
+				attributes: [],
+				comments: [],
+				$container: dataModel
+			};
+			relationField.type = {
+				$type: "DataFieldType",
+				reference: { $refText: upperCaseFirst(referencedCustomModelName) },
+				array: field.type.endsWith("[]"),
+				optional: !field.required,
+				$container: relationField
+			};
+			let action = "Cascade";
+			if (field.references.onDelete === "no action") action = "NoAction";
+			else if (field.references.onDelete === "set null") action = "SetNull";
+			else if (field.references.onDelete === "set default") action = "SetDefault";
+			else if (field.references.onDelete === "restrict") action = "Restrict";
+			const relationAttr = {
+				$type: "DataFieldAttribute",
+				decl: { $refText: "@relation" },
+				args: [],
+				$container: relationField
+			};
+			const fieldsArg = {
+				$type: "AttributeArg",
+				name: "fields",
+				$container: relationAttr
+			};
+			const fieldsExpr = {
+				$type: "ArrayExpr",
+				items: [],
+				$container: fieldsArg
+			};
+			const fkRefExpr = {
+				$type: "ReferenceExpr",
+				args: [],
+				$container: fieldsExpr,
+				target: { $refText: fieldName }
+			};
+			fieldsExpr.items.push(fkRefExpr);
+			fieldsArg.value = fieldsExpr;
+			const referencesArg = {
+				$type: "AttributeArg",
+				name: "references",
+				$container: relationAttr
+			};
+			const referencesExpr = {
+				$type: "ArrayExpr",
+				items: [],
+				$container: referencesArg
+			};
+			const pkRefExpr = {
+				$type: "ReferenceExpr",
+				args: [],
+				$container: referencesExpr,
+				target: { $refText: field.references.field }
+			};
+			referencesExpr.items.push(pkRefExpr);
+			referencesArg.value = referencesExpr;
+			const onDeleteArg = {
+				$type: "AttributeArg",
+				name: "onDelete",
+				$container: relationAttr
+			};
+			onDeleteArg.value = {
+				$type: "ReferenceExpr",
+				target: { $refText: action },
+				args: [],
+				$container: onDeleteArg
+			};
+			relationAttr.args.push(...[
+				fieldsArg,
+				referencesArg,
+				onDeleteArg
+			]);
+			relationField.attributes.push(relationAttr);
+			dataModel.fields.push(relationField);
+		}
+	}
+	if (toManyRelations.has(modelName)) {
+		const relations = toManyRelations.get(modelName);
+		for (const relatedModel of relations) {
+			const relationName = `${lowerCaseFirst(relatedModel)}s`;
+			if (!dataModel.fields.some((f) => f.name === relationName)) {
+				const relationField = {
+					$type: "DataField",
+					name: relationName,
+					attributes: [],
+					comments: [],
+					$container: dataModel
+				};
+				relationField.type = {
+					$type: "DataFieldType",
+					reference: { $refText: relatedModel },
+					array: true,
+					optional: false,
+					$container: relationField
+				};
+				dataModel.fields.push(relationField);
+			}
+		}
+	}
+	return changed;
+}
+function addModelAttribute(dataModel, name, args = []) {
+	const attr = {
+		$type: "DataModelAttribute",
+		decl: { $refText: name },
+		$container: dataModel,
+		args: []
+	};
+	const finalArgs = args.map((arg) => ({
+		...arg,
+		$container: attr
+	}));
+	attr.args.push(...finalArgs);
+	dataModel.attributes.push(attr);
+}
+function addFieldAttribute(dataField, name, args = []) {
+	const attr = {
+		$type: "DataFieldAttribute",
+		decl: { $refText: name },
+		$container: dataField,
+		args: []
+	};
+	const finalArgs = args.map((arg) => ({
+		...arg,
+		$container: attr
+	}));
+	attr.args.push(...finalArgs);
+	dataField.attributes.push(attr);
+}
+function createBooleanAttributeArg(value) {
+	const arg = { $type: "AttributeArg" };
+	arg.value = {
+		$type: "BooleanLiteral",
+		value,
+		$container: arg
+	};
+	return arg;
+}
+function createNumberAttributeArg(value) {
+	const arg = { $type: "AttributeArg" };
+	arg.value = {
+		$type: "NumberLiteral",
+		value: value.toString(),
+		$container: arg
+	};
+	return arg;
+}
+function createStringAttributeArg(value) {
+	const arg = { $type: "AttributeArg" };
+	arg.value = {
+		$type: "StringLiteral",
+		value,
+		$container: arg
+	};
+	return arg;
+}
+//#endregion
+export { generateSchema };
+
+//# sourceMappingURL=schema-generator.mjs.map

package/dist/schema-generator.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema-generator.mjs","names":[],"sources":["../src/schema-generator.ts"],"sourcesContent":["import { lowerCaseFirst, upperCaseFirst } from '@zenstackhq/common-helpers';\nimport { formatDocument, loadDocument, ZModelCodeGenerator } from '@zenstackhq/language';\nimport {\n    Argument,\n    ArrayExpr,\n    AttributeArg,\n    BooleanLiteral,\n    ConfigExpr,\n    ConfigField,\n    DataField,\n    DataFieldAttribute,\n    DataFieldType,\n    DataModel,\n    DataModelAttribute,\n    DataSource,\n    InvocationExpr,\n    isDataModel,\n    Model,\n    NumberLiteral,\n    ReferenceExpr,\n    StringLiteral,\n} from '@zenstackhq/language/ast';\nimport { hasAttribute } from '@zenstackhq/language/utils';\nimport { type BetterAuthOptions } from 'better-auth';\nimport type { DBAdapterSchemaCreation } from 'better-auth/adapters';\nimport type { BetterAuthDBSchema, DBFieldAttribute, DBFieldType } from 'better-auth/db';\nimport fs from 'node:fs';\nimport { match } from 'ts-pattern';\nimport type { AdapterConfig } from './adapter';\n\nexport async function generateSchema(\n    file: string | undefined,\n    tables: BetterAuthDBSchema,\n    config: AdapterConfig,\n    options: BetterAuthOptions,\n): Promise<DBAdapterSchemaCreation> {\n    let filePath = file;\n\n    if (!filePath) {\n        // TODO: respect \"zenstack\" entry in package.json for default schema file path\n        if (fs.existsSync('./schema.zmodel')) {\n            filePath = './schema.zmodel';\n        } else {\n            filePath = './zenstack/schema.zmodel';\n        }\n    }\n\n    const schemaExists = fs.existsSync(filePath);\n\n    const schema = await updateSchema(filePath, tables, config, options);\n\n    return {\n        code: schema ?? '',\n        path: filePath,\n        overwrite: schemaExists && !!schema,\n    };\n}\n\nasync function updateSchema(\n    schemaPath: string,\n    tables: BetterAuthDBSchema,\n    config: AdapterConfig,\n    options: BetterAuthOptions,\n) {\n    let zmodel: Model | undefined;\n    if (fs.existsSync(schemaPath)) {\n        const loadResult = await loadDocument(schemaPath);\n        if (!loadResult.success) {\n            throw new Error(`Failed to load existing schema at ${schemaPath}: ${loadResult.errors.join(', ')}`);\n        }\n        zmodel = loadResult.model;\n    } else {\n        zmodel = initializeZmodel(config);\n    }\n\n    // collect to-many relations\n    const toManyRelations = new Map();\n    for (const [tableName, table] of Object.entries(tables)) {\n        const fields = tables[tableName]?.fields;\n        for (const field in fields) {\n            const attr = fields[field]!;\n            if (attr.references) {\n                const referencedOriginalModel = attr.references.model;\n                const referencedCustomModel = tables[referencedOriginalModel]?.modelName || referencedOriginalModel;\n                const referencedModelNameCap = upperCaseFirst(referencedCustomModel);\n                if (!toManyRelations.has(referencedModelNameCap)) {\n                    toManyRelations.set(referencedModelNameCap, new Set());\n                }\n                const currentCustomModel = table.modelName ?? tableName;\n                const currentModelNameCap = upperCaseFirst(currentCustomModel);\n                toManyRelations.get(referencedModelNameCap).add(currentModelNameCap);\n            }\n        }\n    }\n\n    let changed = false;\n\n    for (const [name, table] of Object.entries(tables)) {\n        const c = addOrUpdateModel(\n            name,\n            table,\n            zmodel,\n            tables,\n            toManyRelations,\n            !!options.advanced?.database?.useNumberId,\n        );\n        changed = changed || c;\n    }\n\n    if (!changed) {\n        return undefined;\n    }\n\n    const generator = new ZModelCodeGenerator();\n    let content = generator.generate(zmodel);\n\n    try {\n        content = await formatDocument(content);\n    } catch {\n        // ignore formatting errors\n    }\n\n    return content;\n}\n\n// @default(now())\nfunction addDefaultNow(df: DataField) {\n    const nowArg: AttributeArg = {\n        $type: 'AttributeArg',\n    } as any;\n    const nowExpr: InvocationExpr = {\n        $type: 'InvocationExpr',\n        function: { $refText: 'now' },\n        args: [],\n        $container: nowArg,\n    };\n    nowArg.value = nowExpr;\n    addFieldAttribute(df, '@default', [nowArg]);\n}\n\nfunction createDataModel(modelName: string, zmodel: Model, numericId: boolean) {\n    const dataModel: DataModel = {\n        $type: 'DataModel',\n        name: modelName,\n        fields: [],\n        attributes: [],\n        mixins: [],\n        comments: [],\n        isView: false,\n        $container: zmodel,\n    };\n\n    let idField: DataField;\n    if (numericId) {\n        idField = addModelField(dataModel, 'id', 'Int', false, false);\n    } else {\n        idField = addModelField(dataModel, 'id', 'String', false, false);\n    }\n    addFieldAttribute(idField, '@id');\n\n    return dataModel;\n}\n\nfunction addModelField(dataModel: DataModel, fieldName: string, fieldType: string, array: boolean, optional: boolean) {\n    const field: DataField = {\n        $type: 'DataField',\n        name: fieldName,\n        attributes: [],\n        comments: [],\n        $container: dataModel,\n    } as any;\n    field.type = {\n        $type: 'DataFieldType',\n        type: fieldType as any,\n        array,\n        optional,\n        $container: field,\n    };\n    dataModel.fields.push(field);\n    return field;\n}\n\nfunction initializeZmodel(config: AdapterConfig) {\n    const zmodel: Model = {\n        $type: 'Model',\n        declarations: [],\n        imports: [],\n    };\n\n    // datasource db { ... }\n    const ds: DataSource = {\n        $type: 'DataSource',\n        name: 'db',\n        fields: [],\n        $container: zmodel,\n    };\n    zmodel.declarations.push(ds);\n\n    // provider = 'sqlite' | 'postgresql'\n    const providerField: ConfigField = {\n        $type: 'ConfigField',\n        name: 'provider',\n        $container: ds,\n    } as any;\n    providerField.value = {\n        $type: 'StringLiteral',\n        value: config.provider,\n        $container: providerField,\n    } satisfies ConfigExpr;\n\n    const urlField: ConfigField = {\n        $type: 'ConfigField',\n        name: 'url',\n        $container: ds,\n    } as any;\n\n    // env('DATABASE_URL')\n    const envCall: InvocationExpr = {\n        $type: 'InvocationExpr',\n        function: {\n            $refText: 'env',\n        },\n        args: [],\n        $container: urlField,\n    };\n\n    // 'DATABASE_URL' arg\n    const dbUrlArg: Argument = {\n        $type: 'Argument',\n    } as any;\n    dbUrlArg.value = {\n        $type: 'StringLiteral',\n        value: 'DATABASE_URL',\n        $container: dbUrlArg,\n    } satisfies ConfigExpr;\n\n    envCall.args = [dbUrlArg];\n\n    urlField.value =\n        config.provider === 'sqlite'\n            ? {\n                  $type: 'StringLiteral',\n                  value: 'file:./dev.db',\n                  $container: urlField,\n              }\n            : envCall;\n\n    ds.fields.push(providerField);\n    ds.fields.push(urlField);\n\n    return zmodel;\n}\n\nfunction getMappedFieldType({ bigint, type }: DBFieldAttribute) {\n    return match<DBFieldType, { type: string; array?: boolean }>(type)\n        .with('string', () => ({ type: 'String' }))\n        .with('number', () => (bigint ? { type: 'BigInt' } : { type: 'Int' }))\n        .with('boolean', () => ({ type: 'Boolean' }))\n        .with('date', () => ({ type: 'DateTime' }))\n        .with('json', () => ({ type: 'Json' }))\n        .with('string[]', () => ({ type: 'String', array: true }))\n        .with('number[]', () => ({ type: 'Int', array: true }))\n        .when(\n            (v) => Array.isArray(v) && v.every((e) => typeof e === 'string'),\n            () => {\n                // Handle enum types (e.g., ['user', 'admin']), map them to String type for now\n                return { type: 'String' };\n            },\n        )\n        .otherwise(() => {\n            throw new Error(`Unsupported field type: ${type}`);\n        });\n}\n\nfunction addOrUpdateModel(\n    tableName: string,\n    table: BetterAuthDBSchema[string],\n    zmodel: Model,\n    tables: BetterAuthDBSchema,\n    toManyRelations: Map<string, Set<string>>,\n    numericId: boolean,\n): boolean {\n    let changed = false;\n    const customModelName = tables[tableName]?.modelName ?? tableName;\n    const modelName = upperCaseFirst(customModelName);\n\n    let dataModel = zmodel.declarations.find((d): d is DataModel => isDataModel(d) && d.name === modelName);\n    if (!dataModel) {\n        changed = true;\n        dataModel = createDataModel(modelName, zmodel, numericId);\n        zmodel.declarations.push(dataModel);\n    }\n\n    if (modelName !== tableName && !hasAttribute(dataModel, '@@map')) {\n        addModelAttribute(dataModel, '@@map', [createStringAttributeArg(tableName)]);\n    }\n\n    for (const [fName, field] of Object.entries(table.fields)) {\n        const fieldName = field.fieldName ?? fName;\n        if (dataModel.fields.some((f) => f.name === fieldName)) {\n            continue;\n        }\n\n        changed = true;\n\n        if (!field.references) {\n            // scalar field\n            const { array, type } = getMappedFieldType(field);\n\n            const df: DataField = {\n                $type: 'DataField',\n                name: fieldName,\n                attributes: [],\n                comments: [],\n                $container: dataModel,\n            } as any;\n            df.type = {\n                $type: 'DataFieldType',\n                type: type as any,\n                array: !!array,\n                optional: !field.required,\n                $container: df,\n            };\n            dataModel.fields.push(df);\n\n            // @id\n            if (fieldName === 'id') {\n                addFieldAttribute(df, '@id');\n            }\n\n            // @unique\n            if (field.unique) {\n                addFieldAttribute(df, '@unique');\n            }\n\n            // @default\n            if (field.defaultValue !== undefined) {\n                if (fieldName === 'createdAt') {\n                    // @default(now())\n                    addDefaultNow(df);\n                } else if (typeof field.defaultValue === 'boolean') {\n                    addFieldAttribute(df, '@default', [createBooleanAttributeArg(field.defaultValue)]);\n                } else if (typeof field.defaultValue === 'string') {\n                    addFieldAttribute(df, '@default', [createStringAttributeArg(field.defaultValue)]);\n                } else if (typeof field.defaultValue === 'number') {\n                    addFieldAttribute(df, '@default', [createNumberAttributeArg(field.defaultValue)]);\n                } else if (typeof field.defaultValue === 'function') {\n                    // For other function-based defaults, we'll need to check what they return\n                    const defaultVal = field.defaultValue();\n                    if (defaultVal instanceof Date) {\n                        // @default(now())\n                        addDefaultNow(df);\n                    } else {\n                        console.warn(\n                            `Warning: Unsupported default function for field ${fieldName} in model ${table.modelName}. Please adjust manually.`,\n                        );\n                    }\n                }\n            }\n\n            // This is a special handling for updatedAt fields\n            if (fieldName === 'updatedAt' && field.onUpdate) {\n                addFieldAttribute(df, '@updatedAt');\n            } else if (field.onUpdate) {\n                console.warn(\n                    `Warning: 'onUpdate' is only supported on 'updatedAt' fields. Please adjust manually for field ${fieldName} in model ${table.modelName}.`,\n                );\n            }\n        } else {\n            // relation\n\n            // fk field\n            addModelField(dataModel, fieldName, numericId ? 'Int' : 'String', false, !field.required);\n\n            // relation field\n            const referencedOriginalModelName = field.references.model;\n            const referencedCustomModelName =\n                tables[referencedOriginalModelName]?.modelName || referencedOriginalModelName;\n\n            const relationField: DataField = {\n                $type: 'DataField',\n                name: lowerCaseFirst(referencedCustomModelName),\n                attributes: [],\n                comments: [],\n                $container: dataModel,\n            } as any;\n            relationField.type = {\n                $type: 'DataFieldType',\n                reference: {\n                    $refText: upperCaseFirst(referencedCustomModelName),\n                },\n                array: (field.type as string).endsWith('[]'),\n                optional: !field.required,\n                $container: relationField,\n            } satisfies DataFieldType;\n\n            let action = 'Cascade';\n            if (field.references.onDelete === 'no action') action = 'NoAction';\n            else if (field.references.onDelete === 'set null') action = 'SetNull';\n            else if (field.references.onDelete === 'set default') action = 'SetDefault';\n            else if (field.references.onDelete === 'restrict') action = 'Restrict';\n\n            // @relation(fields: [field], references: [referencedField], onDelete: action)\n            const relationAttr: DataFieldAttribute = {\n                $type: 'DataFieldAttribute',\n                decl: {\n                    $refText: '@relation',\n                },\n                args: [],\n                $container: relationField,\n            };\n\n            // fields: [field]\n            const fieldsArg: AttributeArg = {\n                $type: 'AttributeArg',\n                name: 'fields',\n                $container: relationAttr,\n            } as any;\n            const fieldsExpr: ArrayExpr = {\n                $type: 'ArrayExpr',\n                items: [],\n                $container: fieldsArg,\n            };\n            const fkRefExpr: ReferenceExpr = {\n                $type: 'ReferenceExpr',\n                args: [],\n                $container: fieldsExpr,\n                target: {\n                    $refText: fieldName,\n                },\n            };\n            fieldsExpr.items.push(fkRefExpr);\n            fieldsArg.value = fieldsExpr;\n\n            // references: [referencedField]\n            const referencesArg: AttributeArg = {\n                $type: 'AttributeArg',\n                name: 'references',\n                $container: relationAttr,\n            } as any;\n            const referencesExpr: ArrayExpr = {\n                $type: 'ArrayExpr',\n                items: [],\n                $container: referencesArg,\n            };\n            const pkRefExpr: ReferenceExpr = {\n                $type: 'ReferenceExpr',\n                args: [],\n                $container: referencesExpr,\n                target: {\n                    $refText: field.references.field,\n                },\n            };\n            referencesExpr.items.push(pkRefExpr);\n            referencesArg.value = referencesExpr;\n\n            // onDelete: action\n            const onDeleteArg: AttributeArg = {\n                $type: 'AttributeArg',\n                name: 'onDelete',\n                $container: relationAttr,\n            } as any;\n            const onDeleteValueExpr: ReferenceExpr = {\n                $type: 'ReferenceExpr',\n                target: { $refText: action },\n                args: [],\n                $container: onDeleteArg,\n            };\n            onDeleteArg.value = onDeleteValueExpr;\n\n            relationAttr.args.push(...[fieldsArg, referencesArg, onDeleteArg]);\n            relationField.attributes.push(relationAttr);\n\n            dataModel.fields.push(relationField);\n        }\n    }\n\n    // add to-many relations\n    if (toManyRelations.has(modelName)) {\n        const relations = toManyRelations.get(modelName)!;\n        for (const relatedModel of relations) {\n            const relationName = `${lowerCaseFirst(relatedModel)}s`;\n            if (!dataModel.fields.some((f) => f.name === relationName)) {\n                const relationField: DataField = {\n                    $type: 'DataField',\n                    name: relationName,\n                    attributes: [],\n                    comments: [],\n                    $container: dataModel,\n                } as any;\n                const relationType: DataFieldType = {\n                    $type: 'DataFieldType',\n                    reference: {\n                        $refText: relatedModel,\n                    },\n                    array: true,\n                    optional: false,\n                    $container: relationField,\n                };\n                relationField.type = relationType;\n                dataModel.fields.push(relationField);\n            }\n        }\n    }\n\n    return changed;\n}\n\nfunction addModelAttribute(dataModel: DataModel, name: string, args: Omit<AttributeArg, '$container'>[] = []) {\n    const attr: DataModelAttribute = {\n        $type: 'DataModelAttribute',\n        decl: { $refText: name },\n        $container: dataModel,\n        args: [],\n    };\n    const finalArgs = args.map((arg) => ({\n        ...arg,\n        $container: attr,\n    }));\n    attr.args.push(...finalArgs);\n    dataModel.attributes.push(attr);\n}\n\nfunction addFieldAttribute(dataField: DataField, name: string, args: Omit<AttributeArg, '$container'>[] = []) {\n    const attr: DataFieldAttribute = {\n        $type: 'DataFieldAttribute',\n        decl: { $refText: name },\n        $container: dataField,\n        args: [],\n    };\n    const finalArgs = args.map((arg) => ({\n        ...arg,\n        $container: attr,\n    }));\n    attr.args.push(...finalArgs);\n    dataField.attributes.push(attr);\n}\n\nfunction createBooleanAttributeArg(value: boolean) {\n    const arg: AttributeArg = {\n        $type: 'AttributeArg',\n    } as any;\n    const expr: BooleanLiteral = {\n        $type: 'BooleanLiteral',\n        value,\n        $container: arg,\n    };\n    arg.value = expr;\n    return arg;\n}\n\nfunction createNumberAttributeArg(value: number) {\n    const arg: AttributeArg = {\n        $type: 'AttributeArg',\n    } as any;\n    const expr: NumberLiteral = {\n        $type: 'NumberLiteral',\n        value: value.toString(),\n        $container: arg,\n    };\n    arg.value = expr;\n    return arg;\n}\n\nfunction createStringAttributeArg(value: string) {\n    const arg: AttributeArg = {\n        $type: 'AttributeArg',\n    } as any;\n    const expr: StringLiteral = {\n        $type: 'StringLiteral',\n        value,\n        $container: arg,\n    };\n    arg.value = expr;\n    return arg;\n}\n"],"mappings":"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"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@zenstackhq/better-auth",
   "displayName": "ZenStack Better Auth Adapter",
   "description": "ZenStack Better Auth Adapter. This adapter is modified from better-auth's Prisma adapter.",
-  "version": "3.6.2",
+  "version": "3.6.3-beta.1",
   "type": "module",
   "author": {
     "name": "ZenStack Team",
@@ -32,6 +32,16 @@
         "default": "./dist/index.cjs"
       }
     },
+    "./schema-generator": {
+      "import": {
+        "types": "./dist/schema-generator.d.mts",
+        "default": "./dist/schema-generator.mjs"
+      },
+      "require": {
+        "types": "./dist/schema-generator.d.cts",
+        "default": "./dist/schema-generator.cjs"
+      }
+    },
     "./package.json": {
       "import": "./package.json",
       "require": "./package.json"
@@ -39,9 +49,9 @@
   },
   "dependencies": {
     "ts-pattern": "^5.7.1",
-    "@zenstackhq/orm": "3.6.2",
-    "@zenstackhq/language": "3.6.2",
-    "@zenstackhq/common-helpers": "3.6.2"
+    "@zenstackhq/common-helpers": "3.6.3-beta.1",
+    "@zenstackhq/orm": "3.6.3-beta.1",
+    "@zenstackhq/language": "3.6.3-beta.1"
   },
   "peerDependencies": {
     "@better-auth/core": "^1.3.0",
@@ -54,11 +64,11 @@
     "better-auth": "1.4.19",
     "kysely": "~0.28.16",
     "tmp": "^0.2.4",
-    "@zenstackhq/cli": "3.6.2",
-    "@zenstackhq/eslint-config": "3.6.2",
-    "@zenstackhq/tsdown-config": "3.6.2",
-    "@zenstackhq/typescript-config": "3.6.2",
-    "@zenstackhq/vitest-config": "3.6.2"
+    "@zenstackhq/typescript-config": "3.6.3-beta.1",
+    "@zenstackhq/eslint-config": "3.6.3-beta.1",
+    "@zenstackhq/vitest-config": "3.6.3-beta.1",
+    "@zenstackhq/cli": "3.6.3-beta.1",
+    "@zenstackhq/tsdown-config": "3.6.3-beta.1"
   },
   "funding": "https://github.com/sponsors/zenstackhq",
   "scripts": {