pecunia-cli 0.1.7 → 0.1.9

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-BhGuoXaD.mjs";
+import { a as generateKyselySchema, n as generateSchema, o as generateDrizzleSchema, r as generatePrismaSchema, t as adapters } from "./generators-D5zLfxo1.mjs";
 
 export { adapters, generateDrizzleSchema, generateKyselySchema, generatePrismaSchema, generateSchema };

package/dist/{generators-BhGuoXaD.mjs → generators-D5zLfxo1.mjs}

@@ -142,9 +142,19 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 			references
 		});
 	}
+	const modelKeyToTableKey = /* @__PURE__ */ new Map();
+	for (const tableKey in tables) {
+		const table = tables[tableKey];
+		const modelName = getModelName(tableKey);
+		modelKeyToTableKey.set(tableKey, tableKey);
+		modelKeyToTableKey.set(modelName, tableKey);
+		modelKeyToTableKey.set(table.modelName, tableKey);
+	}
 	const referenceGraph = /* @__PURE__ */ new Map();
 	for (const tableDef of tableDefinitions) for (const ref of tableDef.references) {
-		const key = `${tableDef.tableKey}->${ref.originalModel}`;
+		const referencedTableKey = modelKeyToTableKey.get(ref.originalModel);
+		if (!referencedTableKey) continue;
+		const key = `${tableDef.tableKey}->${referencedTableKey}`;
 		referenceGraph.set(key, {
 			...ref,
 			sourceTable: tableDef.tableKey,
@@ -153,7 +163,9 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 	}
 	const skipReferences = /* @__PURE__ */ new Set();
 	for (const tableDef of tableDefinitions) for (const ref of tableDef.references) {
-		const reverseKey = `${ref.originalModel}->${tableDef.tableKey}`;
+		const referencedTableKey = modelKeyToTableKey.get(ref.originalModel);
+		if (!referencedTableKey) continue;
+		const reverseKey = `${referencedTableKey}->${tableDef.tableKey}`;
 		const reverseRef = referenceGraph.get(reverseKey);
 		if (reverseRef) {
 			if (!ref.required && ref.onDelete === "set null" && (reverseRef.required || reverseRef.onDelete !== "set null")) skipReferences.add(`${tableDef.tableKey}.${ref.fieldName}`);
@@ -208,54 +220,60 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 		const modelName = getModelName(tableKey);
 		const oneRelations = [];
 		const manyRelations = [];
-		const manyRelationsSet = /* @__PURE__ */ new Set();
-		const foreignFields = Object.entries(table.fields).filter(([_, field]) => field.references);
-		for (const [fieldName, field] of foreignFields) {
-			const referencedModel = field.references.model;
-			const relationKey = getModelName(referencedModel);
-			const fieldRef = `${getModelName(tableKey)}.${getFieldName({
-				model: tableKey,
-				field: fieldName
-			})}`;
-			const referenceRef = `${getModelName(referencedModel)}.${getFieldName({
-				model: referencedModel,
-				field: field.references.field || "id"
-			})}`;
-			oneRelations.push({
-				key: relationKey,
-				model: getModelName(referencedModel),
-				type: "one",
-				reference: {
-					field: fieldRef,
-					references: referenceRef,
-					fieldName
+		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({
+							model: tableKey,
+							field: "id"
+						})}`;
+						manyRelations.push({
+							key: relationName,
+							model: referencedModelName,
+							type: "many",
+							reference: {
+								field: fieldRef,
+								references: referenceRef,
+								fieldName: fkFieldName
+							}
+						});
+					} else manyRelations.push({
+						key: relationName,
+						model: referencedModelName,
+						type: "many"
+					});
 				}
-			});
-		}
-		const otherModels = Object.entries(tables).filter(([otherName]) => otherName !== tableKey);
-		const modelRelationsMap = /* @__PURE__ */ new Map();
-		for (const [otherModelName, otherTable] of otherModels) {
-			const foreignKeysPointingHere = Object.entries(otherTable.fields).filter(([_, field]) => field.references?.model === tableKey || field.references?.model === getModelName(tableKey));
-			if (foreignKeysPointingHere.length === 0) continue;
-			const hasUnique = foreignKeysPointingHere.some(([_, field]) => !!field.unique);
-			const hasMany$1 = foreignKeysPointingHere.some(([_, field]) => !field.unique);
-			modelRelationsMap.set(otherModelName, {
-				modelName: otherModelName,
-				hasUnique,
-				hasMany: hasMany$1
-			});
-		}
-		for (const { modelName: otherModelName, hasMany: hasMany$1 } of modelRelationsMap.values()) {
-			const relationType = hasMany$1 ? "many" : "one";
-			let relationKey = getModelName(otherModelName);
-			if (!adapter.options?.adapterConfig?.usePlural && relationType === "many") relationKey = `${relationKey}s`;
-			if (!manyRelationsSet.has(relationKey)) {
-				manyRelationsSet.add(relationKey);
-				manyRelations.push({
-					key: relationKey,
-					model: getModelName(otherModelName),
-					type: relationType
-				});
 			}
 		}
 		const relationsByModel = /* @__PURE__ */ new Map();

package/dist/index.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { i as getPackageInfo, n as generateSchema } from "./generators-BhGuoXaD.mjs";
+import { i as getPackageInfo, n as generateSchema } from "./generators-D5zLfxo1.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.1.7",
+  "version": "0.1.9",
   "type": "module",
   "module": "dist/index.mjs",
   "main": "./dist/index.mjs",
@@ -64,8 +64,8 @@
     "dotenv": "^17.2.2",
     "drizzle-orm": "^0.33.0",
     "open": "^10.2.0",
-    "pecunia-core": "^0.1.0",
-    "pecunia-root": "^0.1.8",
+    "pecunia-core": "^0.1.2",
+    "pecunia-root": "^0.2.1",
     "pg": "^8.16.3",
     "prettier": "^3.6.2",
     "prompts": "^2.4.2",