pecunia-cli 0.2.0 → 0.2.2

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

package/dist/{generators-DjXYs9VN.mjs → generators-DMu0BKgN.mjs}

@@ -421,6 +421,7 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 			});
 			if (attr.references) {
 				const referencedModelName = tableNameMap.get(attr.references.model) || getModelName(attr.references.model);
+				const onDelete = attr.references.onDelete || "no action";
 				references.push({
 					fieldName,
 					referencedTable: referencedModelName,
@@ -428,8 +429,8 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 						model: attr.references.model,
 						field: attr.references.field
 					}),
-					onDelete: attr.references.onDelete || "cascade",
-					required: attr.required || false,
+					onDelete,
+					required: attr.required ?? false,
 					originalModel: attr.references.model
 				});
 			}
@@ -469,7 +470,14 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 		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}`);
+			const thisIsNullableWithSetNull = !ref.required && ref.onDelete === "set null";
+			const reverseIsNullableWithSetNull = !reverseRef.required && reverseRef.onDelete === "set null";
+			if (thisIsNullableWithSetNull) continue;
+			if (reverseIsNullableWithSetNull && ref.required) {
+				skipReferences.add(`${tableDef.tableKey}.${ref.fieldName}`);
+				continue;
+			}
+			if (!ref.required && (reverseRef.required || ref.onDelete !== "cascade" && reverseRef.onDelete === "cascade")) skipReferences.add(`${tableDef.tableKey}.${ref.fieldName}`);
 		}
 	}
 	for (const tableDef of tableDefinitions) {
@@ -483,6 +491,12 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 		};
 		const referenceMap = /* @__PURE__ */ new Map();
 		for (const ref of references) referenceMap.set(ref.fieldName, ref);
+		const hasCircularRef = references.some((ref) => {
+			const referencedTableKey = modelKeyToTableKey.get(ref.originalModel);
+			if (!referencedTableKey) return false;
+			const reverseKey = `${referencedTableKey}->${tableDef.tableKey}`;
+			return referenceGraph.has(reverseKey);
+		});
 		const fieldDefinitions = Object.keys(fields).filter((field) => field !== "id").map((field) => {
 			const attr = fields[field];
 			const fieldName = attr.fieldName || field;
@@ -506,13 +520,15 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 				if (reverseRef) comment = `\n					// FK constraint removed to break circular dependency with ${ref.referencedTable}\n					// Primary FK: ${reverseRef.sourceModelName}.${reverseRef.fieldName} -> ${modelName}.${fieldName}\n					// This field still maintains referential integrity via application logic and Drizzle relations`;
 				else comment = `\n					// FK constraint removed to break circular dependency with ${ref.referencedTable}\n					// This field still maintains referential integrity via application logic and Drizzle relations`;
 			}
-			const fieldDef = `${fieldName}: ${type}${attr.required ? ".notNull()" : ""}${attr.unique ? ".unique()" : ""}${referenceChain}`;
+			const isRequired = attr.required === true;
+			const fieldDef = `${fieldName}: ${type}${isRequired ? ".notNull()" : ""}${attr.unique ? ".unique()" : ""}${referenceChain}`;
 			return comment ? `${comment}\n					${fieldDef}` : fieldDef;
 		});
+		const typeAssertion = hasCircularRef ? " as any" : "";
 		const schema = `export const ${modelName} = ${databaseType}Table("${convertToSnakeCase(modelName, adapter.options?.camelCase)}", {
 					id: ${id},
 					${fieldDefinitions.join(",\n ")}
-					}${assignIndexes(indexes)});`;
+					}${assignIndexes(indexes)})${typeAssertion};`;
 		code += `\n${schema}\n`;
 	}
 	let relationsString = "";
@@ -897,8 +913,9 @@ const generatePrismaSchema = async ({ adapter, options, file }) => {
 				if (attr.references) {
 					const referencedOriginalModelName = getModelName(attr.references.model);
 					const referencedCustomModelName = tables[referencedOriginalModelName]?.modelName || referencedOriginalModelName;
-					let action = "Cascade";
-					if (attr.references.onDelete === "no action") action = "NoAction";
+					let action = "NoAction";
+					if (attr.references.onDelete === "cascade") action = "Cascade";
+					else if (attr.references.onDelete === "no action") action = "NoAction";
 					else if (attr.references.onDelete === "set null") action = "SetNull";
 					else if (attr.references.onDelete === "set default") action = "SetDefault";
 					else if (attr.references.onDelete === "restrict") action = "Restrict";

package/dist/index.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { i as getPackageInfo, n as generateSchema } from "./generators-DjXYs9VN.mjs";
+import { i as getPackageInfo, n as generateSchema } from "./generators-DMu0BKgN.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.0",
+  "version": "0.2.2",
   "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.2",
-    "pecunia-root": "^0.2.1",
+    "pecunia-core": "^0.1.3",
+    "pecunia-root": "^0.2.2",
     "pg": "^8.16.3",
     "prettier": "^3.6.2",
     "prompts": "^2.4.2",