pecunia-cli 0.1.0 → 0.1.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-a19-M_dj.mjs";
+import { a as generateKyselySchema, n as generateSchema, o as generateDrizzleSchema, r as generatePrismaSchema, t as adapters } from "./generators-97RierQY.mjs";
 
 export { adapters, generateDrizzleSchema, generateKyselySchema, generatePrismaSchema, generateSchema };

package/dist/{generators-a19-M_dj.mjs → generators-97RierQY.mjs}

@@ -13,9 +13,9 @@ function convertToSnakeCase(str, camelCase) {
 }
 const generateDrizzleSchema = async ({ options, file, adapter }) => {
 	const tables = getPaymentTables(options);
-	const filePath = file || "./auth-schema.ts";
+	const filePath = file || "./payment-schema.ts";
 	const databaseType = adapter.options?.provider;
-	if (!databaseType) throw new Error(`Database provider type is undefined during Drizzle schema generation. Please define a \`provider\` in the Drizzle adapter config. Read more at https://better-auth.com/docs/adapters/drizzle`);
+	if (!databaseType) throw new Error("Database provider type is undefined during Drizzle schema generation. Please define a `provider` in the Drizzle adapter config.");
 	const fileExist = existsSync(filePath);
 	let code = generateImport({
 		databaseType,
@@ -35,21 +35,20 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 		const modelName = getModelName(tableKey);
 		const fields = table.fields;
 		function getType(name, field) {
-			if (!databaseType) throw new Error(`Database provider type is undefined during Drizzle schema generation. Please define a \`provider\` in the Drizzle adapter config. Read more at https://better-auth.com/docs/adapters/drizzle`);
 			name = convertToSnakeCase(name, adapter.options?.camelCase);
 			if (field.references?.field === "id") {
-				if (field.references.field) {
-					if (databaseType === "mysql") return `varchar('${name}', { length: 36 })`;
-				}
+				if (databaseType === "mysql") return `varchar('${name}', { length: 36 })`;
 				return `text('${name}')`;
 			}
 			const type = field.type;
-			if (typeof type !== "string") if (Array.isArray(type) && type.every((x) => typeof x === "string")) return {
-				sqlite: `text({ enum: [${type.map((x) => `'${x}'`).join(", ")}] })`,
-				pg: `text('${name}', { enum: [${type.map((x) => `'${x}'`).join(", ")}] })`,
-				mysql: `mysqlEnum([${type.map((x) => `'${x}'`).join(", ")}])`
-			}[databaseType];
-			else throw new TypeError(`Invalid field type for field ${name} in model ${modelName}`);
+			if (typeof type !== "string") {
+				if (Array.isArray(type) && type.every((x) => typeof x === "string")) return {
+					sqlite: `text({ enum: [${type.map((x) => `'${x}'`).join(", ")}] })`,
+					pg: `text('${name}', { enum: [${type.map((x) => `'${x}'`).join(", ")}] })`,
+					mysql: `mysqlEnum([${type.map((x) => `'${x}'`).join(", ")}])`
+				}[databaseType];
+				throw new TypeError(`Invalid field type for field ${name} in model ${modelName}`);
+			}
 			const dbTypeMap = {
 				string: {
 					sqlite: `text('${name}')`,
@@ -85,22 +84,28 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 					sqlite: `text('${name}', { mode: "json" })`,
 					pg: `jsonb('${name}')`,
 					mysql: `json('${name}', { mode: "json" })`
+				},
+				uuid: {
+					sqlite: `text('${name}')`,
+					pg: `uuid('${name}')`,
+					mysql: `varchar('${name}', { length: 36 })`
 				}
 			}[type];
 			if (!dbTypeMap) throw new Error(`Unsupported field type '${field.type}' for field '${name}'.`);
 			return dbTypeMap[databaseType];
 		}
-		let id = "";
-		if (databaseType === "mysql") id = `varchar('id', { length: 36 }).primaryKey()`;
-		else if (databaseType === "pg") id = `text('id').primaryKey()`;
+		const idFieldType = table.fields.id?.type;
+		let id;
+		if (databaseType === "pg" && idFieldType === "uuid") id = `uuid('id').primaryKey()`;
+		else if (databaseType === "mysql") id = `varchar('id', { length: 36 }).primaryKey()`;
 		else id = `text('id').primaryKey()`;
-		let indexes = [];
-		const assignIndexes = (indexes$1) => {
-			if (!indexes$1.length) return "";
-			let code$1 = [`, (table) => [`];
-			for (const index of indexes$1) code$1.push(`  ${index.type}("${index.name}").on(table.${index.on}),`);
-			code$1.push(`]`);
-			return code$1.join("\n");
+		const indexes = [];
+		const assignIndexes = (indexesToAssign) => {
+			if (!indexesToAssign.length) return "";
+			const parts = [`, (table) => [`];
+			for (const index of indexesToAssign) parts.push(`  ${index.type}("${index.name}").on(table.${index.on}),`);
+			parts.push(`]`);
+			return parts.join("\n");
 		};
 		const schema = `export const ${modelName} = ${databaseType}Table("${convertToSnakeCase(modelName, adapter.options?.camelCase)}", {
 					id: ${id},
@@ -164,43 +169,45 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 				}
 			});
 		}
-		const otherModels = Object.entries(tables).filter(([modelName$1]) => modelName$1 !== tableKey);
+		const otherModels = Object.entries(tables).filter(([otherName]) => otherName !== tableKey);
 		const modelRelationsMap = /* @__PURE__ */ new Map();
-		for (const [modelName$1, otherTable] of otherModels) {
+		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(modelName$1, {
-				modelName: modelName$1,
+			modelRelationsMap.set(otherModelName, {
+				modelName: otherModelName,
 				hasUnique,
 				hasMany: hasMany$1
 			});
 		}
-		for (const { modelName: modelName$1, hasMany: hasMany$1 } of modelRelationsMap.values()) {
+		for (const { modelName: otherModelName, hasMany: hasMany$1 } of modelRelationsMap.values()) {
 			const relationType = hasMany$1 ? "many" : "one";
-			let relationKey = getModelName(modelName$1);
+			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(modelName$1),
+					model: getModelName(otherModelName),
 					type: relationType
 				});
 			}
 		}
 		const relationsByModel = /* @__PURE__ */ new Map();
-		for (const relation of oneRelations) if (relation.reference) {
+		for (const relation of oneRelations) {
+			if (!relation.reference) continue;
 			const modelKey = relation.key;
 			if (!relationsByModel.has(modelKey)) relationsByModel.set(modelKey, []);
 			relationsByModel.get(modelKey).push(relation);
 		}
 		const duplicateRelations = [];
 		const singleRelations = [];
-		for (const [_modelKey, relations] of relationsByModel.entries()) if (relations.length > 1) duplicateRelations.push(...relations);
-		else singleRelations.push(relations[0]);
-		for (const relation of duplicateRelations) if (relation.reference) {
+		for (const [_modelKey, rels] of relationsByModel.entries()) if (rels.length > 1) duplicateRelations.push(...rels);
+		else singleRelations.push(rels[0]);
+		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(${getModelName(table.modelName)}, ({ one }) => ({
 				${relation.key}: one(${relation.model}, {
@@ -243,17 +250,19 @@ const generateDrizzleSchema = async ({ options, file, adapter }) => {
 		overwrite: fileExist
 	};
 };
-function generateImport({ databaseType, tables, options }) {
+function generateImport({ databaseType, tables }) {
 	const rootImports = ["relations"];
 	const coreImports = [];
 	let hasBigint = false;
 	let hasJson = false;
+	let hasUuid = false;
 	for (const table of Object.values(tables)) {
 		for (const field of Object.values(table.fields)) {
 			if (field.bigint) hasBigint = true;
 			if (field.type === "json") hasJson = true;
+			if (field.type === "uuid") hasUuid = true;
 		}
-		if (hasJson && hasBigint) break;
+		if (hasJson && hasBigint && hasUuid) break;
 	}
 	coreImports.push(`${databaseType}Table`);
 	coreImports.push(databaseType === "mysql" ? "varchar, text" : databaseType === "pg" ? "text" : "text");
@@ -263,9 +272,8 @@ function generateImport({ databaseType, tables, options }) {
 		if (Object.values(tables).some((table) => Object.values(table.fields).some((field) => (field.type === "number" || field.type === "number[]") && !field.bigint))) coreImports.push("int");
 		if (Object.values(tables).some((table) => Object.values(table.fields).some((field) => typeof field.type !== "string" && Array.isArray(field.type) && field.type.every((x) => typeof x === "string")))) coreImports.push("mysqlEnum");
 	} else if (databaseType === "pg") {
-		const hasNonBigintNumber = Object.values(tables).some((table) => Object.values(table.fields).some((field) => (field.type === "number" || field.type === "number[]") && !field.bigint));
-		Object.values(tables).some((table) => Object.values(table.fields).some((field) => field.references?.field === "id"));
-		if (hasNonBigintNumber) coreImports.push("integer");
+		if (Object.values(tables).some((table) => Object.values(table.fields).some((field) => (field.type === "number" || field.type === "number[]") && !field.bigint))) coreImports.push("integer");
+		if (hasUuid) coreImports.push("uuid");
 	} else coreImports.push("integer");
 	if (hasJson) {
 		if (databaseType === "pg") coreImports.push("jsonb");

package/dist/index.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { i as getPackageInfo, n as generateSchema } from "./generators-a19-M_dj.mjs";
+import { i as getPackageInfo, n as generateSchema } from "./generators-97RierQY.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.0",
+  "version": "0.1.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.0.4",
-    "pecunia-root": "^0.1.2",
+    "pecunia-core": "^0.0.5",
+    "pecunia-root": "^0.1.3",
     "pg": "^8.16.3",
     "prettier": "^3.6.2",
     "prompts": "^2.4.2",