hekireki 0.9.0 → 0.9.2

package/README.md

@@ -707,7 +707,6 @@ impl ActiveModelBehavior for ActiveModel {}
 Table User {
   id String [pk, note: 'Primary key']
   name String [not null, note: 'Display name']
-  posts Post [not null, note: 'One-to-many relation to Post']
 }
 
 Table Post {
@@ -715,7 +714,6 @@ Table Post {
   title String [not null, note: 'Article title']
   content String [not null, note: 'Body content (no length limit)']
   userId String [not null, note: 'Foreign key referencing User.id']
-  user User [not null, note: 'Prisma relation definition']
 }
 
 Ref Post_userId_fk: Post.userId > User.id

package/dist/bin/ajv.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as registerGenerator } from "../bin-Dh-MFTeu.js";
+import { t as registerGenerator } from "../bin-C68-JfzS.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-Dh-MFTeu.js";
+import { t as registerGenerator } from "../bin-C68-JfzS.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-Dh-MFTeu.js";
+import { t as registerGenerator } from "../bin-C68-JfzS.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-Dh-MFTeu.js";
+import { t as registerGenerator } from "../bin-C68-JfzS.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-Dh-MFTeu.js";
+import { t as registerGenerator } from "../bin-C68-JfzS.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-Dh-MFTeu.js";
+import { t as registerGenerator } from "../bin-C68-JfzS.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-Dh-MFTeu.js";
+import { t as registerGenerator } from "../bin-C68-JfzS.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-Dh-MFTeu.js";
+import { t as registerGenerator } from "../bin-C68-JfzS.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-Dh-MFTeu.js";
+import { t as registerGenerator } from "../bin-C68-JfzS.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-Dh-MFTeu.js";
+import { t as registerGenerator } from "../bin-C68-JfzS.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-Dh-MFTeu.js";
+import { t as registerGenerator } from "../bin-C68-JfzS.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-Dh-MFTeu.js";
+import { t as registerGenerator } from "../bin-C68-JfzS.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-Dh-MFTeu.js";
+import { t as registerGenerator } from "../bin-C68-JfzS.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-Dh-MFTeu.js";
+import { t as registerGenerator } from "../bin-C68-JfzS.js";
 //#region src/bin/zod.ts
 registerGenerator("zod");
 //#endregion

package/dist/{bin-Dh-MFTeu.js → bin-C68-JfzS.js}

@@ -595,7 +595,7 @@ function toDBMLColumn(field, models, mapToDbSchema) {
 function makeTables(models, mapToDbSchema = false) {
 	return models.map((model) => {
 		const modelName = mapToDbSchema && model.dbName ? model.dbName : model.name;
-		const columnLines = model.fields.map((field) => toDBMLColumn(field, models, mapToDbSchema)).map(makePrismaColumn).join("\n");
+		const columnLines = model.fields.filter((field) => !field.relationName).map((field) => toDBMLColumn(field, models, mapToDbSchema)).map(makePrismaColumn).join("\n");
 		const indexes = [...model.primaryKey?.fields && model.primaryKey.fields.length > 0 ? [{
 			columns: model.primaryKey.fields,
 			isPrimaryKey: true
@@ -2812,6 +2812,9 @@ const RELATIONSHIPS = {
 	"zero-many": "}o",
 	many: "}|"
 };
+function escapeComment(comment) {
+	return comment.replace(/\r?\n/g, " ").replace(/"/g, "#quot;");
+}
 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})"`;
 }
@@ -2822,7 +2825,7 @@ function modelFields(model) {
 		const commentPart = stripAnnotations(field.documentation) ?? "";
 		const keyMarker = field.isId ? "PK" : fkFields.has(field.name) ? "FK" : "";
 		const keyPart = keyMarker ? ` ${keyMarker}` : "";
-		return `        ${field.type.toLowerCase()} ${field.name}${keyPart}${commentPart ? ` "${commentPart}"` : ""}`;
+		return `        ${field.type.toLowerCase()} ${field.name}${keyPart}${commentPart ? ` "${escapeComment(commentPart)}"` : ""}`;
 	}).filter((field) => field !== null);
 }
 function modelInfo(model) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hekireki",
-  "version": "0.9.0",
+  "version": "0.9.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",