hekireki 0.8.0 → 0.8.2

package/README.md

@@ -712,6 +712,25 @@ generator Hekireki-PNG {
 }
 ```
 
+### Logical Relations (without a Foreign Key)
+
+To draw a relation that has **no physical foreign key**, add a `/// @relation <Parent>.<field> <Child>.<field> <cardinality>` doc-comment on the model:
+
+```prisma
+model User {
+  id   String @id @default(uuid())
+  name String
+}
+
+/// @relation User.id Post.userId one-to-many
+model Post {
+  id     String @id @default(uuid())
+  userId String
+}
+```
+
+The relation is drawn in both the Mermaid and DBML output even though `Post.userId` has no `@relation(...)` foreign key. When a physical FK and an annotation describe the same pair, the annotation's cardinality wins in the Mermaid diagram.
+
 ### Docs
 
 The `hekireki-docs` generator creates an HTML documentation page from your Prisma schema. Serve it locally with `hekireki docs serve`:

package/dist/bin/ajv.js

@@ -1,8 +1,6 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-BDZ9aq7E.js";
-
+import { t as registerGenerator } from "../bin-B_9WDdSx.js";
 //#region src/bin/ajv.ts
 registerGenerator("ajv");
-
 //#endregion
-export {  };
+export {};

package/dist/bin/arktype.js

@@ -1,8 +1,6 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-BDZ9aq7E.js";
-
+import { t as registerGenerator } from "../bin-B_9WDdSx.js";
 //#region src/bin/arktype.ts
 registerGenerator("arktype");
-
 //#endregion
-export {  };
+export {};

package/dist/bin/dbml.js

@@ -1,8 +1,6 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-BDZ9aq7E.js";
-
+import { t as registerGenerator } from "../bin-B_9WDdSx.js";
 //#region src/bin/dbml.ts
 registerGenerator("dbml");
-
 //#endregion
-export {  };
+export {};

package/dist/bin/docs.js

@@ -1,8 +1,6 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-BDZ9aq7E.js";
-
+import { t as registerGenerator } from "../bin-B_9WDdSx.js";
 //#region src/bin/docs.ts
 registerGenerator("docs");
-
 //#endregion
-export {  };
+export {};

package/dist/bin/drizzle.js

@@ -1,8 +1,6 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-BDZ9aq7E.js";
-
+import { t as registerGenerator } from "../bin-B_9WDdSx.js";
 //#region src/bin/drizzle.ts
 registerGenerator("drizzle");
-
 //#endregion
-export {  };
+export {};

package/dist/bin/ecto.js

@@ -1,8 +1,6 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-BDZ9aq7E.js";
-
+import { t as registerGenerator } from "../bin-B_9WDdSx.js";
 //#region src/bin/ecto.ts
 registerGenerator("ecto");
-
 //#endregion
-export {  };
+export {};

package/dist/bin/effect.js

@@ -1,8 +1,6 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-BDZ9aq7E.js";
-
+import { t as registerGenerator } from "../bin-B_9WDdSx.js";
 //#region src/bin/effect.ts
 registerGenerator("effect");
-
 //#endregion
-export {  };
+export {};

package/dist/bin/gorm.js

@@ -1,8 +1,6 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-BDZ9aq7E.js";
-
+import { t as registerGenerator } from "../bin-B_9WDdSx.js";
 //#region src/bin/gorm.ts
 registerGenerator("gorm");
-
 //#endregion
-export {  };
+export {};

package/dist/bin/mermaid-er.js

@@ -1,8 +1,6 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-BDZ9aq7E.js";
-
+import { t as registerGenerator } from "../bin-B_9WDdSx.js";
 //#region src/bin/mermaid-er.ts
 registerGenerator("mermaid-er");
-
 //#endregion
-export {  };
+export {};

package/dist/bin/sea-orm.js

@@ -1,8 +1,6 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-BDZ9aq7E.js";
-
+import { t as registerGenerator } from "../bin-B_9WDdSx.js";
 //#region src/bin/sea-orm.ts
 registerGenerator("sea-orm");
-
 //#endregion
-export {  };
+export {};

package/dist/bin/sqlalchemy.js

@@ -1,8 +1,6 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-BDZ9aq7E.js";
-
+import { t as registerGenerator } from "../bin-B_9WDdSx.js";
 //#region src/bin/sqlalchemy.ts
 registerGenerator("sqlalchemy");
-
 //#endregion
-export {  };
+export {};

package/dist/bin/typebox.js

@@ -1,8 +1,6 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-BDZ9aq7E.js";
-
+import { t as registerGenerator } from "../bin-B_9WDdSx.js";
 //#region src/bin/typebox.ts
 registerGenerator("typebox");
-
 //#endregion
-export {  };
+export {};

package/dist/bin/valibot.js

@@ -1,8 +1,6 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-BDZ9aq7E.js";
-
+import { t as registerGenerator } from "../bin-B_9WDdSx.js";
 //#region src/bin/valibot.ts
 registerGenerator("valibot");
-
 //#endregion
-export {  };
+export {};

package/dist/bin/zod.js

@@ -1,8 +1,6 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-BDZ9aq7E.js";
-
+import { t as registerGenerator } from "../bin-B_9WDdSx.js";
 //#region src/bin/zod.ts
 registerGenerator("zod");
-
 //#endregion
-export {  };
+export {};

package/dist/{bin-BDZ9aq7E.js → bin-B_9WDdSx.js}

@@ -1,4 +1,4 @@
-import fs from "node:fs";
+import "node:fs";
 import path from "node:path";
 import pkg from "@prisma/generator-helper";
 import { format } from "oxfmt";
@@ -8,7 +8,6 @@ import { run } from "@softwaretechnik/dbml-renderer";
 import { Style, css } from "hono/css";
 import { raw } from "hono/html";
 import { Fragment, jsx, jsxs } from "hono/jsx/jsx-runtime";
-
 //#region src/format/index.ts
 async function fmt(input) {
 	const { code, errors } = await format("<stdin>.ts", input, {
@@ -25,7 +24,6 @@ async function fmt(input) {
 		value: code
 	};
 }
-
 //#endregion
 //#region src/fsp/index.ts
 async function mkdir(dir) {
@@ -70,7 +68,6 @@ async function writeFileBinary(path, data) {
 		};
 	}
 }
-
 //#endregion
 //#region src/emit/index.ts
 async function emit(code, dir, output) {
@@ -125,30 +122,20 @@ async function emitMany(files, dir) {
 		value: void 0
 	};
 }
-
-//#endregion
-//#region src/helper/extract-relations.ts
-function collectRelationProps(models) {
-	return models.flatMap((m) => m.fields.filter((f) => f.kind === "object").map((f) => ({
-		model: m.name,
-		key: f.name,
-		targetModel: f.type,
-		isMany: f.isList
-	})));
-}
-function makeRelationsOnly(dmmf, includeType, makeRelations) {
-	const models = dmmf.datamodel.models;
-	const relIndex = collectRelationProps(models);
-	const relByModel = Object.groupBy(relIndex, (r) => r.model);
-	return models.map((model) => makeRelations(model, (relByModel[model.name] ?? []).map(({ key, targetModel, isMany }) => ({
-		key,
-		targetModel,
-		isMany
-	})), { includeType })).filter((code) => Boolean(code)).join("\n\n");
-}
-
 //#endregion
 //#region src/utils/index.ts
+function parseRelation(line) {
+	const match = line.trim().match(/^@relation\s+(\w+)\.(\w+)\s+(\w+)\.(\w+)\s+(\w+-to-\w+)$/);
+	if (!match) return null;
+	const [, fromModel, fromField, toModel, toField, type] = match;
+	return {
+		fromModel,
+		fromField,
+		toModel,
+		toField,
+		type
+	};
+}
 function getString(v, fallback) {
 	return typeof v === "string" ? v : Array.isArray(v) ? v[0] ?? fallback : fallback;
 }
@@ -245,7 +232,6 @@ function schemaFromFields(modelFields, comment, schemaBuilder, propertiesGenerat
 	const modelName = modelFields[0].modelName;
 	return schemaBuilder(modelName, propertiesGenerator(modelFields, comment), objectType);
 }
-
 //#endregion
 //#region src/helper/validation-schema.ts
 function validationSchemas(models, type, comment, config) {
@@ -300,9 +286,8 @@ function validationSchemas(models, type, comment, config) {
 		schemas
 	].join("\n") : schemas;
 }
-
 //#endregion
-//#region src/core/ajv.ts
+//#region src/helper/ajv.ts
 function makeAjvInfer(modelName) {
 	return `export type ${modelName} = FromSchema<typeof ${modelName}Schema>`;
 }
@@ -348,9 +333,33 @@ function ajvSchemaCode(models, type, comment, enums) {
 		formatEnum: makeAjvEnumExpression
 	});
 }
+//#endregion
+//#region src/helper/extract-relations.ts
+function collectRelationProps(models) {
+	return models.flatMap((m) => m.fields.filter((f) => f.kind === "object").map((f) => ({
+		model: m.name,
+		key: f.name,
+		targetModel: f.type,
+		isMany: f.isList
+	})));
+}
+function makeRelationsOnly(dmmf, includeType, makeRelations) {
+	const models = dmmf.datamodel.models;
+	const relIndex = collectRelationProps(models);
+	const relByModel = Object.groupBy(relIndex, (r) => r.model);
+	return models.map((model) => makeRelations(model, (relByModel[model.name] ?? []).map(({ key, targetModel, isMany }) => ({
+		key,
+		targetModel,
+		isMany
+	})), { includeType })).filter((code) => Boolean(code)).join("\n\n");
+}
+//#endregion
+//#region src/generator/ajv.ts
 function ajvCode(dmmf, type, comment, relation) {
 	return [ajvSchemaCode(dmmf.datamodel.models, type, comment, dmmf.datamodel.enums), relation ? makeRelationsOnly(dmmf, type, makeAjvRelations) : ""].filter(Boolean).join("\n\n");
 }
+//#endregion
+//#region src/core/ajv.ts
 async function ajv(options) {
 	if (!(options.generator.isCustomOutput && options.generator.output?.value)) return {
 		ok: false,
@@ -366,9 +375,8 @@ async function ajv(options) {
 	};
 	return emit(ajvCode(options.dmmf, getBool(options.generator.config?.type), getBool(options.generator.config?.comment), getBool(options.generator.config?.relation)), resolved.dir, resolved.file);
 }
-
 //#endregion
-//#region src/core/arktype.ts
+//#region src/helper/arktype.ts
 function makeArktypeInfer(modelName) {
 	return `export type ${modelName} = typeof ${modelName}Schema.infer`;
 }
@@ -417,9 +425,13 @@ function arktypeSchemaCode(models, type, comment, enums) {
 		formatEnum: makeArktypeEnumExpression
 	});
 }
+//#endregion
+//#region src/generator/arktype.ts
 function arktypeCode(dmmf, type, comment, relation) {
 	return [arktypeSchemaCode(dmmf.datamodel.models, type, comment, dmmf.datamodel.enums), relation ? makeRelationsOnly(dmmf, type, makeArktypeRelations) : ""].filter(Boolean).join("\n\n");
 }
+//#endregion
+//#region src/core/arktype.ts
 async function arktype(options) {
 	if (!(options.generator.isCustomOutput && options.generator.output?.value)) return {
 		ok: false,
@@ -435,9 +447,70 @@ async function arktype(options) {
 	};
 	return emit(arktypeCode(options.dmmf, getBool(options.generator.config?.type), getBool(options.generator.config?.comment), getBool(options.generator.config?.relation)), resolved.dir, resolved.file);
 }
-
 //#endregion
-//#region src/core/dbml.ts
+//#region src/helper/relation.ts
+function isCardinality(value) {
+	return value === "zero-one" || value === "one" || value === "zero-many" || value === "many";
+}
+function erKey(relation) {
+	return `${relation.from.model}.${relation.from.field}->${relation.to.model}.${relation.to.field}`;
+}
+function inferredERRelations(models) {
+	return models.flatMap((model) => model.fields.filter((field) => field.kind === "object" && field.relationFromFields && field.relationFromFields.length > 0).map((field) => {
+		const toModel = model.name;
+		const fromModel = field.type;
+		const toField = field.relationFromFields?.[0] ?? "";
+		const fromField = field.relationToFields?.[0] ?? "id";
+		const toCardinality = (models.find((m) => m.name === fromModel)?.fields.find((f) => f.relationName === field.relationName && f.name !== field.name))?.isList ? field.isRequired ? "many" : "zero-many" : field.isRequired ? "one" : "zero-one";
+		return {
+			from: {
+				model: fromModel,
+				field: fromField,
+				cardinality: "one"
+			},
+			to: {
+				model: toModel,
+				field: toField,
+				cardinality: toCardinality
+			},
+			identifying: true,
+			origin: "inferred"
+		};
+	}));
+}
+function annotatedERRelations(models) {
+	return models.flatMap((model) => (model.documentation ?? "").split("\n").flatMap((line) => {
+		const relation = parseRelation(line);
+		if (relation === null) return [];
+		const [fromCard, toCard] = relation.type.split("-to-");
+		if (!isCardinality(fromCard) || !isCardinality(toCard)) return [];
+		return [{
+			from: {
+				model: relation.fromModel,
+				field: relation.fromField,
+				cardinality: fromCard
+			},
+			to: {
+				model: relation.toModel,
+				field: relation.toField,
+				cardinality: toCard
+			},
+			identifying: true,
+			origin: "annotated"
+		}];
+	}));
+}
+function mergeERRelations(models) {
+	const inferred = inferredERRelations(models);
+	const annotated = annotatedERRelations(models);
+	const inferredKeys = new Set(inferred.map(erKey));
+	return [...new Map([...inferred.map((r) => [erKey(r), r]), ...annotated.map((r) => [erKey(r), inferredKeys.has(erKey(r)) ? {
+		...r,
+		origin: "inferred"
+	} : r])]).values()];
+}
+//#endregion
+//#region src/helper/dbml.ts
 function escapeNote(str) {
 	return str.replace(/'/g, "\\'");
 }
@@ -553,19 +626,43 @@ function makeRelations$1(models, mapToDbSchema = false) {
 		});
 	}));
 }
+function isMany(cardinality) {
+	return cardinality === "many" || cardinality === "zero-many";
+}
+function dbmlOperator(leftMany, rightMany) {
+	if (leftMany && !rightMany) return ">";
+	if (!leftMany && rightMany) return "<";
+	if (leftMany && rightMany) return "<>";
+	return "-";
+}
+function annotatedDbmlRefs(models) {
+	const inferredKeys = new Set(inferredERRelations(models).map(erKey));
+	return annotatedERRelations(models).filter((relation) => !inferredKeys.has(erKey(relation))).map((relation) => {
+		const left = `${relation.to.model}.${relation.to.field}`;
+		const right = `${relation.from.model}.${relation.from.field}`;
+		const operator = dbmlOperator(isMany(relation.to.cardinality), isMany(relation.from.cardinality));
+		return `Ref ${`${relation.to.model}_${relation.to.field}_${relation.from.model}_${relation.from.field}`}: ${left} ${operator} ${right}`;
+	});
+}
+//#endregion
+//#region src/generator/dbml.ts
 function dbmlContent(datamodel, mapToDbSchema = false) {
 	const tables = makeTables(datamodel.models, mapToDbSchema);
 	const enums = makeEnums(datamodel.enums);
 	const refs = makeRelations$1(datamodel.models, mapToDbSchema);
+	const logicalRefs = annotatedDbmlRefs(datamodel.models);
 	return [
 		...enums,
 		...tables,
-		...refs
+		...refs,
+		...logicalRefs
 	].join("\n\n");
 }
 function dbmlToPng(dbml) {
 	return new Resvg(run(dbml, "svg"), { font: { loadSystemFonts: true } }).render().asPng();
 }
+//#endregion
+//#region src/core/dbml.ts
 function resolveOutPath(output) {
 	if (path.extname(output)) return output;
 	return path.join(output, "schema.dbml");
@@ -581,9 +678,8 @@ async function dbml(options) {
 	const outPath = resolveOutPath(output);
 	return emitRaw(outPath.endsWith(".png") ? dbmlToPng(content) : content, path.dirname(outPath), outPath);
 }
-
 //#endregion
-//#region src/core/docs/generator/transformDMMF.ts
+//#region src/helper/docs/generator/transformDMMF.ts
 const getMappings = (mappings, datamodel) => {
 	return mappings.modelOperations.filter((mapping) => {
 		const model = datamodel.models.find((m) => m.name === mapping.model);
@@ -609,9 +705,8 @@ const transformDMMF = (dmmf) => {
 		mappings: getMappings(dmmf.mappings, dmmf.datamodel)
 	};
 };
-
 //#endregion
-//#region src/core/docs/styles.ts
+//#region src/helper/docs/styles.ts
 const globalCss = css`
   :-hono-global {
     :root {
@@ -831,9 +926,8 @@ const mb2Class = css`
 const ml4Class = css`
   margin-left: 1rem;
 `;
-
 //#endregion
-//#region src/core/docs/generator/helpers.ts
+//#region src/helper/docs/generator/helpers.ts
 const capitalize = (str) => str[0].toUpperCase() + str.slice(1);
 const lowerCase = (name) => name.substring(0, 1).toLowerCase() + name.substring(1);
 const primitiveTypes = [
@@ -846,9 +940,8 @@ const primitiveTypes = [
 	"Null"
 ];
 const isScalarType = (type) => primitiveTypes.includes(type);
-
 //#endregion
-//#region src/core/docs/generator/apitypes.tsx
+//#region src/helper/docs/generator/apitypes.tsx
 const TypeRefLink = ({ typeRef, kind }) => {
 	const typeName = typeRef.type;
 	if (isScalarType(typeName)) return /* @__PURE__ */ jsx(Fragment, { children: typeName });
@@ -946,9 +1039,8 @@ const getTypesData = (d) => {
 const createTypes = (d) => {
 	return /* @__PURE__ */ jsx(TypesSection, { data: getTypesData(d) });
 };
-
 //#endregion
-//#region src/core/docs/generator/model.tsx
+//#region src/helper/docs/generator/model.tsx
 const ModelAction = {
 	create: "create",
 	deleteMany: "deleteMany",
@@ -1312,9 +1404,8 @@ const getModelData = (d) => ({ models: getModels$1(d) });
 const createModels = (d) => {
 	return /* @__PURE__ */ jsx(ModelsSection, { data: getModelData(d) });
 };
-
 //#endregion
-//#region src/core/docs/generator/toc.tsx
+//#region src/helper/docs/generator/toc.tsx
 const TOCSubHeader = ({ name }) => /* @__PURE__ */ jsx("div", {
 	class: tocSubHeaderClass,
 	children: /* @__PURE__ */ jsx("a", {
@@ -1442,9 +1533,8 @@ const getTOCData = (d) => ({
 const createTOC = (d) => {
 	return /* @__PURE__ */ jsx(TOCComponent, { data: getTOCData(d) });
 };
-
 //#endregion
-//#region src/core/docs/printer/index.tsx
+//#region src/helper/docs/printer/index.tsx
 const HekirekiLogo = () => /* @__PURE__ */ jsxs("svg", {
 	width: "40",
 	height: "40",
@@ -1535,7 +1625,11 @@ const generateHTML = (data) => {
 		})]
 	}) })).toString()}`;
 };
-
+//#endregion
+//#region src/generator/docs.ts
+function docsHTML(dmmf) {
+	return generateHTML(transformDMMF(dmmf));
+}
 //#endregion
 //#region src/core/docs.ts
 async function docs(options) {
@@ -1544,11 +1638,10 @@ async function docs(options) {
 		error: "output is required for Hekireki-Docs. Please specify output in your generator config."
 	};
 	const output = options.generator.output.value;
-	return emitRaw(generateHTML(transformDMMF(options.dmmf)), output, path.join(output, "index.html"));
+	return emitRaw(docsHTML(options.dmmf), output, path.join(output, "index.html"));
 }
-
 //#endregion
-//#region src/core/drizzle.ts
+//#region src/helper/drizzle.ts
 function resolveDbProvider(provider) {
 	switch (provider) {
 		case "postgresql":
@@ -1906,6 +1999,8 @@ function makeRelations(models, imports) {
 		return `export const ${modelVar}Relations = relations(${modelVar}, ({ ${[needsOne ? "one" : "", needsMany ? "many" : ""].filter(Boolean).join(", ")} }) => ({ ${fieldLines} }))`;
 	});
 }
+//#endregion
+//#region src/generator/drizzle.ts
 function drizzleSchema(datamodel, provider, indexes) {
 	const db = resolveDbProvider(provider);
 	const imports = createImports();
@@ -1930,6 +2025,8 @@ function parsePrismaProvider(raw) {
 		error: `Unsupported provider: ${raw}`
 	};
 }
+//#endregion
+//#region src/core/drizzle.ts
 async function drizzle(options) {
 	if (!(options.generator.isCustomOutput && options.generator.output?.value)) return {
 		ok: false,
@@ -1947,9 +2044,8 @@ async function drizzle(options) {
 	};
 	return emit(drizzleSchema(options.dmmf.datamodel, providerResult.value, options.dmmf.datamodel.indexes), resolved.dir, resolved.file);
 }
-
 //#endregion
-//#region src/core/ecto.ts
+//#region src/helper/ecto.ts
 function prismaTypeToEctoType(type) {
 	if (type === "Int") return "integer";
 	if (type === "BigInt") return "integer";
@@ -2210,12 +2306,16 @@ function ectoSchemas(models, app, allModels, enums) {
 		].join("\n");
 	}).filter(Boolean).join("\n\n");
 }
+//#endregion
+//#region src/generator/ecto.ts
 function ectoSchemaFiles(models, app, enums) {
 	return models.map((model) => ({
 		fileName: `${makeSnakeCase(model.name)}.ex`,
 		code: ectoSchemas([model], app, models, enums)
 	})).filter((entry) => entry.code.trim().length > 0);
 }
+//#endregion
+//#region src/core/ecto.ts
 async function ecto(options) {
 	if (!(options.generator.isCustomOutput && options.generator.output?.value)) return {
 		ok: false,
@@ -2226,11 +2326,10 @@ async function ecto(options) {
 	const enums = options.dmmf.datamodel.enums;
 	return emitMany(ectoSchemaFiles(options.dmmf.datamodel.models, app, enums), outDir);
 }
-
 //#endregion
-//#region src/core/effect.ts
+//#region src/helper/effect.ts
 function makeEffectInfer(modelName) {
-	return `export type ${modelName}Encoded = typeof ${modelName}Schema.Encoded`;
+	return `export type ${modelName} = typeof ${modelName}Schema.Type`;
 }
 function makeEffectSchema(modelName, fields) {
 	return `export const ${modelName}Schema = Schema.Struct({\n${fields}\n})`;
@@ -2261,7 +2360,7 @@ function makeEffectRelations(model, relProps, options) {
 	if (relProps.length === 0) return null;
 	const base = `...${model.name}Schema.fields,`;
 	const rels = relProps.map((r) => `${r.key}:${r.isMany ? `Schema.Array(${r.targetModel}Schema)` : `${r.targetModel}Schema`},`).join("");
-	const typeLine = options?.includeType ? `\n\nexport type ${model.name}RelationsEncoded = typeof ${model.name}RelationsSchema.Encoded` : "";
+	const typeLine = options?.includeType ? `\n\nexport type ${model.name}Relations = typeof ${model.name}RelationsSchema.Type` : "";
 	return `export const ${model.name}RelationsSchema = Schema.Struct({${base}${rels}})${typeLine}`;
 }
 function effectSchemaCode(models, type, comment, enums) {
@@ -2277,9 +2376,13 @@ function effectSchemaCode(models, type, comment, enums) {
 		formatEnum: makeEffectEnumExpression
 	});
 }
+//#endregion
+//#region src/generator/effect.ts
 function effectCode(dmmf, type, comment, relation) {
 	return [effectSchemaCode(dmmf.datamodel.models, type, comment, dmmf.datamodel.enums), relation ? makeRelationsOnly(dmmf, type, makeEffectRelations) : ""].filter(Boolean).join("\n\n");
 }
+//#endregion
+//#region src/core/effect.ts
 async function effect(options) {
 	if (!(options.generator.isCustomOutput && options.generator.output?.value)) return {
 		ok: false,
@@ -2295,9 +2398,8 @@ async function effect(options) {
 	};
 	return emit(effectCode(options.dmmf, getBool(options.generator.config?.type), getBool(options.generator.config?.comment), getBool(options.generator.config?.relation)), resolved.dir, resolved.file);
 }
-
 //#endregion
-//#region src/core/gorm.ts
+//#region src/helper/gorm.ts
 const PRISMA_TO_GO = {
 	String: "string",
 	Int: "int",
@@ -2586,6 +2688,8 @@ function formatImports(imports) {
 		")"
 	];
 }
+//#endregion
+//#region src/generator/gorm.ts
 function generateGormModels(models, enums, indexes, packageName = "model") {
 	const idx = indexes ?? [];
 	const modelBodies = models.map((model) => generateModelStruct(model, models, enums, idx)).filter((body) => body !== null);
@@ -2597,6 +2701,8 @@ function generateGormModels(models, enums, indexes, packageName = "model") {
 		""
 	].join("\n");
 }
+//#endregion
+//#region src/core/gorm.ts
 async function gorm(options) {
 	if (!(options.generator.isCustomOutput && options.generator.output?.value)) return {
 		ok: false,
@@ -2609,18 +2715,17 @@ async function gorm(options) {
 	const indexes = options.dmmf.datamodel.indexes;
 	return emitRaw(generateGormModels(options.dmmf.datamodel.models, enums, indexes, packageName), path.dirname(outPath), outPath);
 }
-
 //#endregion
-//#region src/core/mermaid-er.ts
-function removeDuplicateRelations(relations) {
-	return [...new Set(relations)];
-}
+//#region src/helper/mermaid-er.ts
 const RELATIONSHIPS = {
 	"zero-one": "|o",
 	one: "||",
 	"zero-many": "}o",
 	many: "}|"
 };
+function erRelationLine(relation) {
+	return `    ${relation.from.model} ${RELATIONSHIPS[relation.from.cardinality]}--${RELATIONSHIPS[relation.to.cardinality]} ${relation.to.model} : "(${relation.from.field}) - (${relation.to.field})"`;
+}
 function modelFields(model) {
 	const fkFields = new Set(model.fields.filter((f) => f.relationFromFields && f.relationFromFields.length > 0).flatMap((f) => f.relationFromFields ?? []));
 	return model.fields.map((field) => {
@@ -2638,28 +2743,22 @@ function modelInfo(model) {
 		"    }"
 	];
 }
-function extractRelationsFromDmmf(models) {
-	return models.flatMap((model) => model.fields.filter((field) => field.kind === "object" && field.relationFromFields && field.relationFromFields.length > 0).map((field) => {
-		const toModel = model.name;
-		const fromModel = field.type;
-		const toField = field.relationFromFields?.[0];
-		const fromField = field.relationToFields?.[0] ?? "id";
-		const toCardinality = (models.find((m) => m.name === fromModel)?.fields.find((f) => f.relationName === field.relationName && f.name !== field.name))?.isList ? field.isRequired ? "many" : "zero-many" : field.isRequired ? "one" : "zero-one";
-		return `    ${fromModel} ${RELATIONSHIPS.one}--${RELATIONSHIPS[toCardinality]} ${toModel} : "(${fromField}) - (${toField})"`;
-	}));
-}
+//#endregion
+//#region src/generator/mermaid-er.ts
 const ER_HEADER = ["```mermaid", "erDiagram"];
 const ER_FOOTER = ["```"];
 function erContent(models) {
-	const uniqueRelations = removeDuplicateRelations(extractRelationsFromDmmf(models));
+	const relations = mergeERRelations(models).map(erRelationLine);
 	const modelInfos = models.flatMap(modelInfo);
 	return [
 		...ER_HEADER,
-		...uniqueRelations,
+		...relations,
 		...modelInfos,
 		...ER_FOOTER
 	];
 }
+//#endregion
+//#region src/core/mermaid-er.ts
 async function mermaidEr(options) {
 	if (!(options.generator.isCustomOutput && options.generator.output?.value)) return {
 		ok: false,
@@ -2676,9 +2775,8 @@ async function mermaidEr(options) {
 	};
 	return emitRaw(content.join("\n"), resolved.dir, resolved.file);
 }
-
 //#endregion
-//#region src/core/sea-orm.ts
+//#region src/helper/sea-orm.ts
 const PRISMA_TO_RUST = {
 	String: "String",
 	Int: "i32",
@@ -3034,6 +3132,8 @@ function collectM2MPairs(models) {
 		return true;
 	});
 }
+//#endregion
+//#region src/generator/sea-orm.ts
 function seaOrmFiles(models, enums, serde = {}) {
 	const useLines = ["use sea_orm::entity::prelude::*;", "use serde::{Deserialize, Serialize};"];
 	const enumFiles = enums.map((e) => ({
@@ -3079,6 +3179,8 @@ function seaOrmFiles(models, enums, serde = {}) {
 		code
 	})), modEntry];
 }
+//#endregion
+//#region src/core/sea-orm.ts
 async function seaOrm(options) {
 	if (!(options.generator.isCustomOutput && options.generator.output?.value)) return {
 		ok: false,
@@ -3089,9 +3191,8 @@ async function seaOrm(options) {
 	const enums = options.dmmf.datamodel.enums;
 	return emitMany(seaOrmFiles(options.dmmf.datamodel.models, enums, serde), outDir);
 }
-
 //#endregion
-//#region src/core/sqlalchemy.ts
+//#region src/helper/sqlalchemy.ts
 const PRISMA_TO_PYTHON = {
 	String: "str",
 	Int: "int",
@@ -3491,6 +3592,8 @@ function collectGlobalImports(models, _enums, indexes, m2mTables) {
 	if (needsUuid) lines.push("import uuid as uuid_mod");
 	return lines;
 }
+//#endregion
+//#region src/generator/sqlalchemy.ts
 function generateSingleFile(models, enums, indexes) {
 	const idx = indexes ?? [];
 	const m2mTables = collectManyToManyTables(models);
@@ -3510,6 +3613,8 @@ function generateSingleFile(models, enums, indexes) {
 		""
 	].join("\n");
 }
+//#endregion
+//#region src/core/sqlalchemy.ts
 async function sqlalchemy(options) {
 	if (!(options.generator.isCustomOutput && options.generator.output?.value)) return {
 		ok: false,
@@ -3521,9 +3626,8 @@ async function sqlalchemy(options) {
 	const indexes = options.dmmf.datamodel.indexes;
 	return emitRaw(generateSingleFile(options.dmmf.datamodel.models, enums, indexes), path.dirname(outPath), outPath);
 }
-
 //#endregion
-//#region src/core/typebox.ts
+//#region src/helper/typebox.ts
 function makeTypeBoxInfer(modelName) {
 	return `export type ${modelName} = Static<typeof ${modelName}Schema>`;
 }
@@ -3576,9 +3680,13 @@ function typeboxSchemaCode(models, type, comment, enums) {
 		formatEnum: makeTypeBoxEnumExpression
 	});
 }
+//#endregion
+//#region src/generator/typebox.ts
 function typeboxCode(dmmf, type, comment, relation) {
 	return [typeboxSchemaCode(dmmf.datamodel.models, type, comment, dmmf.datamodel.enums), relation ? makeRelationsOnly(dmmf, type, makeTypeBoxRelations) : ""].filter(Boolean).join("\n\n");
 }
+//#endregion
+//#region src/core/typebox.ts
 async function typebox(options) {
 	if (!(options.generator.isCustomOutput && options.generator.output?.value)) return {
 		ok: false,
@@ -3594,9 +3702,8 @@ async function typebox(options) {
 	};
 	return emit(typeboxCode(options.dmmf, getBool(options.generator.config?.type), getBool(options.generator.config?.comment), getBool(options.generator.config?.relation)), resolved.dir, resolved.file);
 }
-
 //#endregion
-//#region src/core/valibot.ts
+//#region src/helper/valibot.ts
 function makeValibotInfer(modelName) {
 	return `export type ${modelName} = v.InferOutput<typeof ${modelName}Schema>`;
 }
@@ -3640,9 +3747,13 @@ function valibotSchemaCode(models, type, comment, enums) {
 		formatEnum: makeValibotEnumExpression
 	});
 }
+//#endregion
+//#region src/generator/valibot.ts
 function valibotCode(dmmf, type, comment, relation) {
 	return [valibotSchemaCode(dmmf.datamodel.models, type, comment, dmmf.datamodel.enums), relation ? makeRelationsOnly(dmmf, type, makeValibotRelations) : ""].filter(Boolean).join("\n\n");
 }
+//#endregion
+//#region src/core/valibot.ts
 async function valibot(options) {
 	if (!(options.generator.isCustomOutput && options.generator.output?.value)) return {
 		ok: false,
@@ -3658,9 +3769,8 @@ async function valibot(options) {
 	};
 	return emit(valibotCode(options.dmmf, getBool(options.generator.config?.type), getBool(options.generator.config?.comment), getBool(options.generator.config?.relation)), resolved.dir, resolved.file);
 }
-
 //#endregion
-//#region src/core/zod.ts
+//#region src/helper/zod.ts
 function makeZodInfer(modelName) {
 	return `export type ${modelName} = z.infer<typeof ${modelName}Schema>`;
 }
@@ -3704,9 +3814,13 @@ function zodSchemaCode(models, type, comment, zodVersion, enums) {
 		formatEnum: makeZodEnumExpression
 	});
 }
+//#endregion
+//#region src/generator/zod.ts
 function zodCode(dmmf, type, comment, relation, version) {
 	return [zodSchemaCode(dmmf.datamodel.models, type, comment, version, dmmf.datamodel.enums), relation ? makeRelationsOnly(dmmf, type, makeZodRelations) : ""].filter(Boolean).join("\n\n");
 }
+//#endregion
+//#region src/core/zod.ts
 async function zod(options) {
 	if (!(options.generator.isCustomOutput && options.generator.output?.value)) return {
 		ok: false,
@@ -3722,7 +3836,6 @@ async function zod(options) {
 	};
 	return emit(zodCode(options.dmmf, getBool(options.generator.config?.type), getBool(options.generator.config?.comment), getBool(options.generator.config?.relation), getString(options.generator.config?.zod, "v4")), resolved.dir, resolved.file);
 }
-
 //#endregion
 //#region src/bin/index.ts
 const GENERATORS = {
@@ -3798,6 +3911,5 @@ function registerGenerator(name) {
 		}
 	});
 }
-
 //#endregion
-export { registerGenerator as t };
+export { registerGenerator as t };

package/dist/cli/index.js

@@ -4,7 +4,6 @@ import path from "node:path";
 import { serve } from "@hono/node-server";
 import { serveStatic } from "@hono/node-server/serve-static";
 import { Hono } from "hono";
-
 //#region src/cli/index.ts
 const HELP_TEXT = `⚡️ hekireki - Prisma schema tools
 
@@ -131,6 +130,5 @@ else {
 	console.error(result.error);
 	process.exit(1);
 }
-
 //#endregion
-export { DOCS_HELP_TEXT, HELP_TEXT, handleDocs, hekireki, parsePort };
+export { DOCS_HELP_TEXT, HELP_TEXT, handleDocs, hekireki, parsePort };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hekireki",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "description": "Hekireki is a tool that generates validation schemas for Zod, Valibot, ArkType, and Effect Schema, as well as ER diagrams and DBML, from Prisma schemas annotated with comments.",
   "keywords": [
     "ajv",
@@ -61,31 +61,31 @@
     "release": "npm pkg fix && pnpm build && npm publish"
   },
   "dependencies": {
-    "@hono/node-server": "^1.19.9",
-    "@prisma/generator-helper": "^7.4.0",
+    "@hono/node-server": "^2.0.1",
+    "@prisma/generator-helper": "^7.8.0",
     "@resvg/resvg-js": "^2.6.2",
     "@softwaretechnik/dbml-renderer": "^1.0.31",
-    "hono": "^4.11.9",
-    "oxfmt": "^0.33.0"
+    "hono": "^4.12.16",
+    "oxfmt": "^0.47.0"
   },
   "devDependencies": {
-    "@paralleldrive/cuid2": "^2.3.1",
-    "@prisma/client": "^7.4.0",
-    "@sinclair/typebox": "^0.34.33",
-    "@types/node": "^25.2.3",
-    "@typescript/native-preview": "7.0.0-dev.20260218.1",
-    "ajv": "^8.17.1",
-    "arktype": "^2.1.29",
-    "better-auth": "^1.5.5",
-    "drizzle-kit": "^0.31.9",
-    "drizzle-orm": "^0.45.1",
-    "effect": "^3.19.18",
+    "@paralleldrive/cuid2": "^3.3.0",
+    "@prisma/client": "^7.8.0",
+    "@sinclair/typebox": "^0.34.49",
+    "@types/node": "^25.6.0",
+    "@typescript/native-preview": "7.0.0-dev.20260504.1",
+    "ajv": "^8.20.0",
+    "arktype": "^2.2.0",
+    "better-auth": "^1.6.9",
+    "drizzle-kit": "^0.31.10",
+    "drizzle-orm": "^0.45.2",
+    "effect": "^3.21.2",
     "json-schema-to-ts": "^3.1.1",
-    "prisma": "^7.4.0",
-    "tsdown": "^0.20.3",
+    "prisma": "^7.8.0",
+    "tsdown": "^0.21.10",
     "tsx": "^4.21.0",
-    "typescript": "^5.9.3",
-    "valibot": "1.2.0",
-    "zod": "^4.3.6"
+    "typescript": "^6.0.3",
+    "valibot": "1.3.1",
+    "zod": "^4.4.3"
   }
 }