hekireki 0.8.3 → 0.8.5

package/dist/bin/ajv.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-Brdok3Yj.js";
+import { t as registerGenerator } from "../bin-Dcg9ZO7c.js";
 //#region src/bin/ajv.ts
 registerGenerator("ajv");
 //#endregion

package/dist/bin/arktype.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-Brdok3Yj.js";
+import { t as registerGenerator } from "../bin-Dcg9ZO7c.js";
 //#region src/bin/arktype.ts
 registerGenerator("arktype");
 //#endregion

package/dist/bin/dbml.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-Brdok3Yj.js";
+import { t as registerGenerator } from "../bin-Dcg9ZO7c.js";
 //#region src/bin/dbml.ts
 registerGenerator("dbml");
 //#endregion

package/dist/bin/docs.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-Brdok3Yj.js";
+import { t as registerGenerator } from "../bin-Dcg9ZO7c.js";
 //#region src/bin/docs.ts
 registerGenerator("docs");
 //#endregion

package/dist/bin/drizzle.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-Brdok3Yj.js";
+import { t as registerGenerator } from "../bin-Dcg9ZO7c.js";
 //#region src/bin/drizzle.ts
 registerGenerator("drizzle");
 //#endregion

package/dist/bin/ecto.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-Brdok3Yj.js";
+import { t as registerGenerator } from "../bin-Dcg9ZO7c.js";
 //#region src/bin/ecto.ts
 registerGenerator("ecto");
 //#endregion

package/dist/bin/effect.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-Brdok3Yj.js";
+import { t as registerGenerator } from "../bin-Dcg9ZO7c.js";
 //#region src/bin/effect.ts
 registerGenerator("effect");
 //#endregion

package/dist/bin/gorm.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-Brdok3Yj.js";
+import { t as registerGenerator } from "../bin-Dcg9ZO7c.js";
 //#region src/bin/gorm.ts
 registerGenerator("gorm");
 //#endregion

package/dist/bin/mermaid-er.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-Brdok3Yj.js";
+import { t as registerGenerator } from "../bin-Dcg9ZO7c.js";
 //#region src/bin/mermaid-er.ts
 registerGenerator("mermaid-er");
 //#endregion

package/dist/bin/sea-orm.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-Brdok3Yj.js";
+import { t as registerGenerator } from "../bin-Dcg9ZO7c.js";
 //#region src/bin/sea-orm.ts
 registerGenerator("sea-orm");
 //#endregion

package/dist/bin/sqlalchemy.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-Brdok3Yj.js";
+import { t as registerGenerator } from "../bin-Dcg9ZO7c.js";
 //#region src/bin/sqlalchemy.ts
 registerGenerator("sqlalchemy");
 //#endregion

package/dist/bin/typebox.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-Brdok3Yj.js";
+import { t as registerGenerator } from "../bin-Dcg9ZO7c.js";
 //#region src/bin/typebox.ts
 registerGenerator("typebox");
 //#endregion

package/dist/bin/valibot.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-Brdok3Yj.js";
+import { t as registerGenerator } from "../bin-Dcg9ZO7c.js";
 //#region src/bin/valibot.ts
 registerGenerator("valibot");
 //#endregion

package/dist/bin/zod.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-Brdok3Yj.js";
+import { t as registerGenerator } from "../bin-Dcg9ZO7c.js";
 //#region src/bin/zod.ts
 registerGenerator("zod");
 //#endregion

package/dist/{bin-Brdok3Yj.js → bin-Dcg9ZO7c.js}

@@ -530,8 +530,11 @@ function makeRefName(ref) {
 function combineKeys(keys) {
 	return keys.length > 1 ? `(${keys.join(", ")})` : keys[0];
 }
-function quote(value) {
-	return `'${escapeNote(value)}'`;
+function escapeTriple(str) {
+	return str.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
+}
+function noteLiteral(value) {
+	return value.includes("\n") ? `'''${escapeTriple(value)}'''` : `'${escapeNote(value)}'`;
 }
 function makeIndex(index) {
 	return `    ${index.columns.length > 1 ? `(${index.columns.join(", ")})` : index.columns[0]}${formatConstraints([
@@ -562,7 +565,7 @@ function makePrismaColumn(column) {
 		column.defaultValue !== void 0 && `default: ${column.defaultValue}`,
 		column.isUnique && "unique",
 		column.isNotNull && "not null",
-		column.note && `note: ${quote(column.note)}`
+		column.note && `note: ${noteLiteral(column.note)}`
 	].filter((c) => Boolean(c));
 	return `  ${column.name} ${column.type}${formatConstraints(constraints)}`;
 }
@@ -602,7 +605,7 @@ function makeTables(models, mapToDbSchema = false) {
 		}))];
 		const indexBlock = indexes.length > 0 ? `\n\n  indexes {\n${indexes.map(makeIndex).join("\n")}\n  }` : "";
 		const strippedNote = stripAnnotations(model.documentation);
-		return `Table ${modelName} {\n${columnLines}${indexBlock}${strippedNote ? `\n\n  Note: ${quote(escapeNote(strippedNote))}` : ""}\n}`;
+		return `Table ${modelName} {\n${columnLines}${indexBlock}${strippedNote ? `\n\n  Note: ${noteLiteral(strippedNote)}` : ""}\n}`;
 	});
 }
 function makeEnums(enums) {
@@ -1771,8 +1774,18 @@ function generateImports(imports, provider) {
 		...[...imports.ext.entries()].map(([pkg, fns]) => `import { ${[...fns].sort().join(", ")} } from '${pkg}'`)
 	].filter(Boolean).join("\n");
 }
-function toCamelCase(name) {
-	return name.charAt(0).toLowerCase() + name.slice(1);
+function snakeToCamel(name) {
+	return name.replace(/_+([a-zA-Z0-9])/g, (_, c) => c.toUpperCase());
+}
+function resolveTableName(model) {
+	return model.dbName ?? makeSnakeCase(model.name);
+}
+function resolveVarName(model) {
+	return snakeToCamel(resolveTableName(model));
+}
+function resolveVarNameByType(type, models) {
+	const target = models.find((m) => m.name === type);
+	return snakeToCamel(target ? resolveTableName(target) : makeSnakeCase(type));
 }
 function isFieldDefault(v) {
 	return typeof v === "object" && v !== null && "name" in v;
@@ -1918,17 +1931,17 @@ const PRISMA_ACTION_MAP = {
 	NoAction: "no action",
 	SetDefault: "set default"
 };
-function makeFkReference(field, model) {
+function makeFkReference(field, model, models) {
 	const relField = model.fields.find((f) => f.kind === "object" && f.relationFromFields && f.relationFromFields.includes(field.name));
 	if (!(relField?.relationFromFields && relField.relationToFields)) return "";
 	if (relField.type === model.name) return "";
-	const targetVar = toCamelCase(relField.type);
+	const targetVar = resolveVarNameByType(relField.type, models);
 	const toCol = relField.relationToFields[0] ?? "id";
 	const onDelete = relField.relationOnDelete;
 	const drizzleAction = onDelete ? PRISMA_ACTION_MAP[onDelete] : void 0;
 	return `.references(() => ${targetVar}.${toCol}${drizzleAction ? `, { onDelete: '${drizzleAction}' }` : ""})`;
 }
-function makeColumn(field, model, provider, imports, enums) {
+function makeColumn(field, model, models, provider, imports, enums) {
 	if (field.kind === "object") return null;
 	if (field.kind === "unsupported") return `// unsupported type: ${field.name}`;
 	const isAutoincrement = isFieldDefault(field.default) && field.default.name === "autoincrement";
@@ -1938,7 +1951,7 @@ function makeColumn(field, model, provider, imports, enums) {
 		field.isId && !hasCompositePK ? isAutoincrement && provider === "sqlite" ? ".primaryKey({ autoIncrement: true })" : ".primaryKey()" : "",
 		field.isRequired && !field.isId && !(isAutoincrement && provider === "postgresql") ? ".notNull()" : "",
 		field.isUnique ? ".unique()" : "",
-		makeFkReference(field, model),
+		makeFkReference(field, model, models),
 		isAutoincrement ? provider === "mysql" ? ".autoincrement()" : "" : field.isUpdatedAt && (field.default === void 0 || field.default === null) ? (() => {
 			const r = resolveUpdatedAtDefault(provider);
 			if (r.needsSql) imports.orm.add("sql");
@@ -1969,18 +1982,18 @@ function makeCompositeConstraints(model, imports, indexes, tableName) {
 	].filter((l) => l !== null);
 	return all.length > 0 ? all.join(", ") : null;
 }
-function makeTable(model, provider, imports, enums, indexes) {
+function makeTable(model, models, provider, imports, enums, indexes) {
 	const tableFunc = provider === "postgresql" ? "pgTable" : provider === "mysql" ? "mysqlTable" : "sqliteTable";
 	imports.core.add(tableFunc);
-	const varName = toCamelCase(model.name);
-	const tableName = model.dbName ?? makeSnakeCase(model.name);
-	const columns = model.fields.map((field) => makeColumn(field, model, provider, imports, enums)).filter((c) => c !== null).join(", ");
+	const varName = resolveVarName(model);
+	const tableName = resolveTableName(model);
+	const columns = model.fields.map((field) => makeColumn(field, model, models, provider, imports, enums)).filter((c) => c !== null).join(", ");
 	const constraints = makeCompositeConstraints(model, imports, indexes, tableName);
 	return constraints ? `export const ${varName} = ${tableFunc}('${tableName}', { ${columns} }, (table) => [${constraints}])` : `export const ${varName} = ${tableFunc}('${tableName}', { ${columns} })`;
 }
-function makeRelationField(field, model, _models, relFields) {
-	const targetVar = toCamelCase(field.type);
-	const modelVar = toCamelCase(model.name);
+function makeRelationField(field, model, models, relFields) {
+	const targetVar = resolveVarNameByType(field.type, models);
+	const modelVar = resolveVarName(model);
 	const needsAlias = relFields.filter((f) => f.type === field.type).length > 1 && field.relationName;
 	if (field.relationFromFields && field.relationFromFields.length > 0) {
 		const fromCol = field.relationFromFields[0];
@@ -2002,7 +2015,7 @@ function makeRelations(models, imports) {
 	return modelsWithRels.map((model) => {
 		const relFields = model.fields.filter((f) => f.kind === "object");
 		const fieldLines = relFields.map((field) => makeRelationField(field, model, models, relFields)).join(", ");
-		const modelVar = toCamelCase(model.name);
+		const modelVar = resolveVarName(model);
 		const needsOne = relFields.some((f) => f.relationFromFields && f.relationFromFields.length > 0 || !f.isList);
 		const needsMany = relFields.some((f) => f.isList && !(f.relationFromFields && f.relationFromFields.length > 0));
 		return `export const ${modelVar}Relations = relations(${modelVar}, ({ ${[needsOne ? "one" : "", needsMany ? "many" : ""].filter(Boolean).join(", ")} }) => ({ ${fieldLines} }))`;
@@ -2013,7 +2026,7 @@ function makeRelations(models, imports) {
 function drizzleSchema(datamodel, provider, indexes) {
 	const db = resolveDbProvider(provider);
 	const imports = createImports();
-	const tableLines = datamodel.models.map((model) => makeTable(model, db, imports, datamodel.enums, indexes));
+	const tableLines = datamodel.models.map((model) => makeTable(model, datamodel.models, db, imports, datamodel.enums, indexes));
 	const relationsLines = makeRelations(datamodel.models, imports);
 	const tableLinesWithGap = tableLines.flatMap((line, i) => i < tableLines.length - 1 ? [line, ""] : [line]);
 	const relationsLinesWithGap = relationsLines.flatMap((line, i) => i < relationsLines.length - 1 ? [line, ""] : [line]);
@@ -2732,8 +2745,8 @@ const RELATIONSHIPS = {
 	"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 erRelationLine(relation, resolveName = (model) => model) {
+	return `    ${resolveName(relation.from.model)} ${RELATIONSHIPS[relation.from.cardinality]}--${RELATIONSHIPS[relation.to.cardinality]} ${resolveName(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 ?? []));
@@ -2747,7 +2760,7 @@ function modelFields(model) {
 }
 function modelInfo(model) {
 	return [
-		`    ${model.name} {`,
+		`    ${model.dbName ?? model.name} {`,
 		...modelFields(model),
 		"    }"
 	];
@@ -2757,7 +2770,8 @@ function modelInfo(model) {
 const ER_HEADER = ["```mermaid", "erDiagram"];
 const ER_FOOTER = ["```"];
 function erContent(models) {
-	const relations = mergeERRelations(models).map(erRelationLine);
+	const resolveName = (model) => models.find((m) => m.name === model)?.dbName ?? model;
+	const relations = mergeERRelations(models).map((relation) => erRelationLine(relation, resolveName));
 	const modelInfos = models.flatMap(modelInfo);
 	return [
 		...ER_HEADER,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hekireki",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "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",