pecunia-cli 0.2.6 → 0.2.7

package/dist/api.mjs

@@ -1,3 +1,3 @@
-import { a as generateKyselySchema, n as generateSchema, o as generateDrizzleSchema, r as generatePrismaSchema, t as adapters } from "./generators-BVZYl7Wb.mjs";
+import { a as generateKyselySchema, n as generateSchema, o as generateDrizzleSchema, r as generatePrismaSchema, t as adapters } from "./generators-Cb42XRwg.mjs";
 
 export { adapters, generateDrizzleSchema, generateKyselySchema, generatePrismaSchema, generateSchema };

package/dist/{generators-BVZYl7Wb.mjs → generators-Cb42XRwg.mjs}

@@ -633,61 +633,97 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 		const modelName = getModelName(tableKey);
 		const oneRelations = [];
 		const manyRelations = [];
-		if (table.relations) for (const [relationName, relationDef] of Object.entries(table.relations)) {
-			const referencedModelName = getModelName(relationDef.model);
-			const foreignKeyField = table.fields[relationDef.foreignKey];
-			if (relationDef.kind === "one") {
-				if (foreignKeyField?.references) {
-					const fieldRef = `${modelName}.${getFieldName({
-						model: tableKey,
-						field: relationDef.foreignKey
-					})}`;
-					const referenceRef = `${referencedModelName}.${getFieldName({
-						model: relationDef.model,
-						field: foreignKeyField.references.field || "id"
-					})}`;
-					oneRelations.push({
-						key: relationName,
-						model: referencedModelName,
-						type: "one",
-						reference: {
-							field: fieldRef,
-							references: referenceRef,
-							fieldName: relationDef.foreignKey
-						}
-					});
-				}
-			} else if (relationDef.kind === "many") {
-				const referencedTable = tables[relationDef.model];
-				if (referencedTable) {
-					const fkField = Object.entries(referencedTable.fields).find(([_, field]) => field.references && (field.references.model === tableKey || field.references.model === getModelName(tableKey)));
-					if (fkField) {
-						const [fkFieldName] = fkField;
-						const fieldRef = `${referencedModelName}.${getFieldName({
-							model: relationDef.model,
-							field: fkFieldName
-						})}`;
-						const referenceRef = `${modelName}.${getFieldName({
+		if (table.relations) {
+			for (const [relationName, relationDef] of Object.entries(table.relations)) {
+				const referencedModelName = getModelName(relationDef.model);
+				const foreignKeyField = table.fields[relationDef.foreignKey];
+				const isSelfReferential = relationDef.model === tableKey || referencedModelName === modelName;
+				const generateRelationName = (fkName) => {
+					let cleaned = convertToSnakeCase(fkName, adapter.options?.camelCase).replace(/_by_id$/, "").replace(/_id$/, "");
+					const participleToNoun = {
+						"reversed": "reversal",
+						"created": "creation",
+						"updated": "update"
+					};
+					if (participleToNoun[cleaned]) cleaned = participleToNoun[cleaned];
+					return `${convertToSnakeCase(modelName, adapter.options?.camelCase)}_${cleaned}`;
+				};
+				if (relationDef.kind === "one") {
+					if (foreignKeyField?.references) {
+						const fieldRef = `${modelName}.${getFieldName({
 							model: tableKey,
-							field: "id"
+							field: relationDef.foreignKey
 						})}`;
-						manyRelations.push({
+						const referenceRef = `${referencedModelName}.${getFieldName({
+							model: relationDef.model,
+							field: foreignKeyField.references.field || "id"
+						})}`;
+						oneRelations.push({
 							key: relationName,
 							model: referencedModelName,
-							type: "many",
+							type: "one",
 							reference: {
 								field: fieldRef,
 								references: referenceRef,
-								fieldName: fkFieldName
+								fieldName: relationDef.foreignKey
+							},
+							relationName: isSelfReferential ? generateRelationName(relationDef.foreignKey) : void 0
+						});
+					}
+				} else if (relationDef.kind === "many") {
+					const referencedTable = tables[relationDef.model];
+					if (referencedTable) {
+						const fkField = Object.entries(referencedTable.fields).find(([_, field]) => field.references && (field.references.model === tableKey || field.references.model === getModelName(tableKey)));
+						if (fkField) {
+							const [fkFieldName] = fkField;
+							const fieldRef = `${referencedModelName}.${getFieldName({
+								model: relationDef.model,
+								field: fkFieldName
+							})}`;
+							const referenceRef = `${modelName}.${getFieldName({
+								model: tableKey,
+								field: "id"
+							})}`;
+							let relationNameForMany;
+							if (isSelfReferential) {
+								const matchingOne = oneRelations.find((rel) => rel.reference?.fieldName === fkFieldName && rel.model === referencedModelName);
+								if (matchingOne?.relationName) relationNameForMany = matchingOne.relationName;
+								else {
+									let cleaned = convertToSnakeCase(fkFieldName, adapter.options?.camelCase).replace(/_by_id$/, "").replace(/_id$/, "");
+									const participleToNoun = {
+										"reversed": "reversal",
+										"created": "creation",
+										"updated": "update"
+									};
+									if (participleToNoun[cleaned]) cleaned = participleToNoun[cleaned];
+									relationNameForMany = `${convertToSnakeCase(modelName, adapter.options?.camelCase)}_${cleaned}`;
+								}
 							}
+							manyRelations.push({
+								key: relationName,
+								model: referencedModelName,
+								type: "many",
+								reference: {
+									field: fieldRef,
+									references: referenceRef,
+									fieldName: fkFieldName
+								},
+								relationName: relationNameForMany
+							});
+						} else manyRelations.push({
+							key: relationName,
+							model: referencedModelName,
+							type: "many"
 						});
-					} else manyRelations.push({
-						key: relationName,
-						model: referencedModelName,
-						type: "many"
-					});
+					}
 				}
 			}
+			for (const oneRel of oneRelations) {
+				if (!oneRel.relationName || !oneRel.reference) continue;
+				const oneRelFieldName = oneRel.reference.fieldName;
+				const matchingMany = manyRelations.find((manyRel) => manyRel.model === oneRel.model && manyRel.reference?.fieldName === oneRelFieldName);
+				if (matchingMany) matchingMany.relationName = oneRel.relationName;
+			}
 		}
 		const relationsByModel = /* @__PURE__ */ new Map();
 		for (const relation of oneRelations) {
@@ -703,10 +739,12 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 		for (const relation of duplicateRelations) {
 			if (!relation.reference) continue;
 			const fieldName = relation.reference.fieldName;
-			const tableRelation = `export const ${`${modelName}${fieldName.charAt(0).toUpperCase() + fieldName.slice(1)}Relations`} = relations(${modelName}, ({ one }) => ({
+			const relationExportName = `${modelName}${fieldName.charAt(0).toUpperCase() + fieldName.slice(1)}Relations`;
+			const relationNameParam = relation.relationName ? `,\n					relationName: "${relation.relationName}"` : "";
+			const tableRelation = `export const ${relationExportName} = relations(${modelName}, ({ one }) => ({
 				${relation.key}: one(${relation.model}, {
 					fields: [${relation.reference.field}],
-					references: [${relation.reference.references}],
+					references: [${relation.reference.references}]${relationNameParam}
 				})
 			}))`;
 			relationsString += `\n${tableRelation}\n`;
@@ -715,24 +753,36 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 		const hasMany = manyRelations.length > 0;
 		if (hasOne && hasMany) {
 			const tableRelation = `export const ${modelName}Relations = relations(${modelName}, ({ one, many }) => ({
-				${singleRelations.map((relation) => relation.reference ? ` ${relation.key}: one(${relation.model}, {
+				${singleRelations.map((relation) => {
+				if (!relation.reference) return "";
+				const relationNameParam = relation.relationName ? `,\n					relationName: "${relation.relationName}"` : "";
+				return ` ${relation.key}: one(${relation.model}, {
 					fields: [${relation.reference.field}],
-					references: [${relation.reference.references}],
-				})` : "").filter((x) => x !== "").join(",\n ")}${singleRelations.length > 0 && manyRelations.length > 0 ? "," : ""}
-				${manyRelations.map(({ key, model }) => ` ${key}: many(${model})`).join(",\n ")}
+					references: [${relation.reference.references}]${relationNameParam}
+				})`;
+			}).filter((x) => x !== "").join(",\n ")}${singleRelations.length > 0 && manyRelations.length > 0 ? "," : ""}
+				${manyRelations.map(({ key, model, relationName }) => {
+				return ` ${key}: many(${model}${relationName ? `, { relationName: "${relationName}" }` : ""})`;
+			}).join(",\n ")}
 			}))`;
 			relationsString += `\n${tableRelation}\n`;
 		} else if (hasOne) {
 			const tableRelation = `export const ${modelName}Relations = relations(${modelName}, ({ one }) => ({
-				${singleRelations.map((relation) => relation.reference ? ` ${relation.key}: one(${relation.model}, {
+				${singleRelations.map((relation) => {
+				if (!relation.reference) return "";
+				const relationNameParam = relation.relationName ? `,\n					relationName: "${relation.relationName}"` : "";
+				return ` ${relation.key}: one(${relation.model}, {
 					fields: [${relation.reference.field}],
-					references: [${relation.reference.references}],
-				})` : "").filter((x) => x !== "").join(",\n ")}
+					references: [${relation.reference.references}]${relationNameParam}
+				})`;
+			}).filter((x) => x !== "").join(",\n ")}
 			}))`;
 			relationsString += `\n${tableRelation}\n`;
 		} else if (hasMany) {
 			const tableRelation = `export const ${modelName}Relations = relations(${modelName}, ({ many }) => ({
-				${manyRelations.map(({ key, model }) => ` ${key}: many(${model})`).join(",\n ")}
+				${manyRelations.map(({ key, model, relationName }) => {
+				return ` ${key}: many(${model}${relationName ? `, { relationName: "${relationName}" }` : ""})`;
+			}).join(",\n ")}
 			}))`;
 			relationsString += `\n${tableRelation}\n`;
 		}

package/dist/index.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { i as getPackageInfo, n as generateSchema } from "./generators-BVZYl7Wb.mjs";
+import { i as getPackageInfo, n as generateSchema } from "./generators-Cb42XRwg.mjs";
 import { Command } from "commander";
 import fs, { existsSync, readFileSync } from "node:fs";
 import fs$1 from "node:fs/promises";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pecunia-cli",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "type": "module",
   "module": "dist/index.mjs",
   "main": "./dist/index.mjs",