pecunia-cli 0.3.7 → 0.3.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-CWgRQHR-.mjs";
+import { a as generateKyselySchema, n as generateSchema, o as generateDrizzleSchema, r as generatePrismaSchema, t as adapters } from "./generators-27dPVtx_.mjs";
 
 export { adapters, generateDrizzleSchema, generateKyselySchema, generatePrismaSchema, generateSchema };

package/dist/{generators-CWgRQHR-.mjs → generators-27dPVtx_.mjs}

@@ -30,7 +30,18 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 		schema: tables,
 		usePlural: adapter.options?.adapterConfig?.usePlural
 	});
-	for (const tableKey in tables) {
+	const circularReferenceFields = new Set(["defaultPaymentMethodId", "defaultPriceId"]);
+	const sortedTableKeys = Object.keys(tables).sort((a, b) => {
+		const tableA = tables[a];
+		const tableB = tables[b];
+		const orderA = tableA.order ?? 0;
+		const orderB = tableB.order ?? 0;
+		if (orderA !== orderB) return orderA - orderB;
+		if (Object.values(tableA.fields).some((field) => field.references?.model === b || field.references?.model === getModelName(b))) return 1;
+		if (Object.values(tableB.fields).some((field) => field.references?.model === a || field.references?.model === getModelName(a))) return -1;
+		return 0;
+	});
+	for (const tableKey of sortedTableKeys) {
 		const table = tables[tableKey];
 		const modelName = getModelName(tableKey);
 		const fields = table.fields;
@@ -103,7 +114,7 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 		};
 		const schema = `export const ${modelName} = ${databaseType}Table("${convertToSnakeCase(modelName, adapter.options?.camelCase)}", {
 					id: ${id},
-					${Object.keys(fields).map((field) => {
+					${Object.keys(fields).filter((field) => field !== "id").map((field) => {
 			const attr = fields[field];
 			const fieldName = attr.fieldName || field;
 			let type = getType(fieldName, attr);
@@ -112,11 +123,6 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 				name: `${modelName}_${fieldName}_idx`,
 				on: fieldName
 			});
-			else if (attr.index && attr.unique) indexes.push({
-				type: "uniqueIndex",
-				name: `${modelName}_${fieldName}_uidx`,
-				on: fieldName
-			});
 			if (attr.defaultValue !== null && typeof attr.defaultValue !== "undefined") if (typeof attr.defaultValue === "function") {
 				if (attr.type === "date" && attr.defaultValue.toString().includes("new Date()")) if (databaseType === "sqlite") type += `.default(sql\`(cast(unixepoch('subsecond') * 1000 as integer))\`)`;
 				else type += `.defaultNow()`;
@@ -125,7 +131,14 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 			if (attr.onUpdate && attr.type === "date") {
 				if (typeof attr.onUpdate === "function") type += `.$onUpdate(${attr.onUpdate})`;
 			}
-			return `${fieldName}: ${type}${attr.required ? ".notNull()" : ""}${attr.unique ? ".unique()" : ""}${attr.references ? `.references(()=> ${getModelName(attr.references.model)}.${getFieldName({
+			const isCircularReference = circularReferenceFields.has(field);
+			const shouldAddReference = attr.references && !isCircularReference;
+			if (isCircularReference && attr.index) indexes.push({
+				type: "index",
+				name: `${modelName}_${fieldName}_idx`,
+				on: fieldName
+			});
+			return `${fieldName}: ${type}${attr.required ? ".notNull()" : ""}${attr.unique ? ".unique()" : ""}${shouldAddReference ? `.references(()=> ${getModelName(attr.references.model)}.${getFieldName({
 				model: attr.references.model,
 				field: attr.references.field
 			})}, { onDelete: '${attr.references.onDelete || "cascade"}' })` : ""}`;
@@ -134,26 +147,37 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 		code += `\n${schema}\n`;
 	}
 	let relationsString = "";
-	for (const tableKey in tables) {
+	for (const tableKey of sortedTableKeys) {
 		const table = tables[tableKey];
 		const modelName = getModelName(tableKey);
 		const oneRelations = [];
 		const manyRelations = [];
 		const manyRelationsSet = /* @__PURE__ */ new Set();
-		const foreignFields = Object.entries(table.fields).filter(([_, field]) => field.references);
+		const foreignFields = Object.entries(table.fields).filter(([fieldName, field]) => field.references || circularReferenceFields.has(fieldName) && field.type === "string");
 		for (const [fieldName, field] of foreignFields) {
-			const referencedModel = field.references.model;
+			let referencedModel;
+			let referenceField = "id";
+			if (field.references) {
+				referencedModel = field.references.model;
+				referenceField = field.references.field || "id";
+			} else if (circularReferenceFields.has(fieldName)) if (fieldName === "defaultPaymentMethodId") referencedModel = "payment_method";
+			else if (fieldName === "defaultPriceId") referencedModel = "prices";
+			else continue;
+			else continue;
 			const relationKey = getModelName(referencedModel);
+			let relationName;
+			if (circularReferenceFields.has(fieldName)) relationName = fieldName.replace(/Id$/, "");
+			else relationName = relationKey;
 			const fieldRef = `${getModelName(tableKey)}.${getFieldName({
 				model: tableKey,
 				field: fieldName
 			})}`;
 			const referenceRef = `${getModelName(referencedModel)}.${getFieldName({
 				model: referencedModel,
-				field: field.references.field || "id"
+				field: referenceField
 			})}`;
 			oneRelations.push({
-				key: relationKey,
+				key: relationName,
 				model: getModelName(referencedModel),
 				type: "one",
 				reference: {
@@ -163,7 +187,7 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 				}
 			});
 		}
-		const otherModels = Object.entries(tables).filter(([modelName$1]) => modelName$1 !== tableKey);
+		const otherModels = sortedTableKeys.filter((modelName$1) => modelName$1 !== tableKey).map((modelName$1) => [modelName$1, tables[modelName$1]]);
 		const modelRelationsMap = /* @__PURE__ */ new Map();
 		for (const [modelName$1, otherTable] of otherModels) {
 			const foreignKeysPointingHere = Object.entries(otherTable.fields).filter(([_, field]) => field.references?.model === tableKey || field.references?.model === getModelName(tableKey));
@@ -179,7 +203,16 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 		for (const { modelName: modelName$1, hasMany: hasMany$1 } of modelRelationsMap.values()) {
 			const relationType = hasMany$1 ? "many" : "one";
 			let relationKey = getModelName(modelName$1);
-			if (!adapter.options?.adapterConfig?.usePlural && relationType === "many") relationKey = `${relationKey}s`;
+			if (!adapter.options?.adapterConfig?.usePlural && relationType === "many") {
+				if (!relationKey.endsWith("s")) relationKey = `${relationKey}s`;
+			}
+			const pluralFixes = {
+				"productss": "products",
+				"pricess": "prices",
+				"webhook_deliverys": "webhookDeliveries",
+				"webhookDeliverys": "webhookDeliveries"
+			};
+			if (pluralFixes[relationKey]) relationKey = pluralFixes[relationKey];
 			if (!manyRelationsSet.has(relationKey)) {
 				manyRelationsSet.add(relationKey);
 				manyRelations.push({

package/dist/index.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { i as getPackageInfo, n as generateSchema } from "./generators-CWgRQHR-.mjs";
+import { i as getPackageInfo, n as generateSchema } from "./generators-27dPVtx_.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.3.7",
+  "version": "0.3.9",
   "type": "module",
   "module": "dist/index.mjs",
   "main": "./dist/index.mjs",