@monkeyplus/payscope 1.0.1 → 1.0.3

package/dist/_chunks/database.mjs

@@ -84,7 +84,7 @@ const customBigSerial = customType({
 	codec: "bigint:string"
 });
 const checkouts = buys.table("checkouts", {
-	id: p.bigserial({ mode: "number" }).primaryKey().notNull(),
+	id: customBigSerial().primaryKey().notNull(),
 	total: p.numeric({ mode: "number" }).default(0).notNull(),
 	base: p.numeric({ mode: "number" }),
 	items: p.jsonb().notNull().$type(),

package/dist/_chunks/db.d.mts

@@ -971,14 +971,18 @@ declare const checkouts: p.PgTableWithColumns<{
   name: "checkouts";
   schema: "buys";
   columns: {
-    id: p.PgBuildColumn<"checkouts", p.SetNotNull<p.SetIsPrimaryKey<p.PgBigSerial53Builder>>, {
+    id: p.PgBuildColumn<"checkouts", p.SetNotNull<p.SetIsPrimaryKey<p.PgCustomColumnBuilder<{
+      dataType: "custom";
+      data: string;
+      driverParam: unknown;
+    }>>>, {
       name: string;
       tableName: "checkouts";
-      dataType: "number int53";
-      data: number;
-      driverParam: number;
+      dataType: "custom";
+      data: string;
+      driverParam: unknown;
       notNull: true;
-      hasDefault: true;
+      hasDefault: false;
       isPrimaryKey: false;
       isAutoincrement: false;
       hasRuntimeDefault: false;

package/dist/_chunks/taxes.mjs

@@ -0,0 +1,214 @@
+function roundNum(v, r = 2) {
+	return Number(Number(v).toFixed(r));
+}
+function calcPercentaje(value, percentaje, hasInclude) {
+	const val = +value;
+	const per = +percentaje;
+	if (hasInclude) return roundNum(val * per / (100 + per));
+	else return roundNum(val / 100 * per);
+}
+function calcDiscount(amount, discount) {
+	if ("percent" in discount) return {
+		amount: calcPercentaje(amount, discount.percent),
+		percent: +discount.percent
+	};
+	else return { amount: +discount.amount };
+}
+const sum = (arr) => arr.reduce((a, b) => a + b, 0);
+const flatten = (arr) => arr.reduce((a, b) => a.concat(b), []);
+function groupBy(fn, arr) {
+	return arr.reduce((acc, value) => {
+		const key = fn(value);
+		if (!acc[key]) acc[key] = [];
+		acc[key].push(value);
+		return acc;
+	}, {});
+}
+function calcAmount(_itemDiscount, _parentDiscount, taxIncluded) {
+	return (price) => {
+		if (!taxIncluded) {
+			const itemDiscount = calcDiscount(price, _itemDiscount);
+			const parentDiscount = calcDiscount(price - itemDiscount.amount, _parentDiscount);
+			const unitBase = price - (itemDiscount.amount + parentDiscount.amount);
+			return {
+				price,
+				discounts: {
+					itemDiscount,
+					parentDiscount
+				},
+				unitAmount: unitBase,
+				unitBase
+			};
+		} else {
+			const parentDiscount = calcDiscount(price, _parentDiscount);
+			const itemDiscount = calcDiscount(price - parentDiscount.amount, _itemDiscount);
+			return {
+				price,
+				discounts: {
+					itemDiscount,
+					parentDiscount
+				},
+				unitAmount: price - (itemDiscount.amount + parentDiscount.amount),
+				unitBase: 0
+			};
+		}
+	};
+}
+function calcSingleItem(parentDiscount = { amount: 0 }) {
+	return (item) => {
+		const quantity = +item.quantity;
+		const taxes = item.taxes || [];
+		const calcRawTax = (base, rate) => base * rate / 100;
+		const calculateTaxesForward = (originalBase, finalBase, raw = false) => {
+			const firstTaxes = [];
+			const latestTaxes = [];
+			let totalFirstTaxesAmount = 0;
+			let totalLatestTaxesAmount = 0;
+			for (const t of taxes) if (t.beforeTaxes) {
+				const baseToUse = t.excludeDiscount ? originalBase : finalBase;
+				const amount = raw ? calcRawTax(baseToUse, +t.value) : calcPercentaje(baseToUse, t.value, false);
+				firstTaxes.push({
+					...t,
+					base: baseToUse,
+					amount,
+					totalBase: baseToUse * quantity,
+					totalAmount: amount * quantity
+				});
+				totalFirstTaxesAmount += amount;
+			}
+			for (const t of taxes) if (!t.beforeTaxes) {
+				const baseToUse = (t.excludeDiscount ? originalBase : finalBase) + totalFirstTaxesAmount;
+				const amount = raw ? calcRawTax(baseToUse, +t.value) : calcPercentaje(baseToUse, t.value, false);
+				latestTaxes.push({
+					...t,
+					base: baseToUse,
+					amount,
+					totalBase: baseToUse * quantity,
+					totalAmount: amount * quantity
+				});
+				totalLatestTaxesAmount += amount;
+			}
+			return {
+				firstTaxes,
+				latestTaxes,
+				totalTaxes: totalFirstTaxesAmount + totalLatestTaxesAmount,
+				totalPrice: finalBase + totalFirstTaxesAmount + totalLatestTaxesAmount
+			};
+		};
+		if (!item.taxIncluded) {
+			const amounts = calcAmount(item.discount, parentDiscount, false)(+item.price);
+			const originalBase = amounts.price;
+			const finalBase = amounts.unitBase;
+			const result = calculateTaxesForward(originalBase, finalBase, false);
+			amounts.total = amounts.unitBase * quantity + result.totalTaxes * quantity;
+			return {
+				id: item.id,
+				title: item.title,
+				taxIncluded: item.taxIncluded,
+				item: amounts,
+				taxes: [...result.firstTaxes, ...result.latestTaxes],
+				quantity,
+				product: item.product,
+				variant: item.variant,
+				discountAllocations: item.discountAllocations
+			};
+		} else {
+			const amounts = calcAmount(item.discount, parentDiscount, true)(+item.price);
+			const originalPriceWithTaxes = amounts.price;
+			const finalPriceWithTaxes = amounts.unitAmount;
+			const T1_1 = calculateTaxesForward(1, 1, true).totalPrice;
+			const originalBaseRaw = originalPriceWithTaxes / (T1_1 === 0 ? 1 : T1_1);
+			const T0 = calculateTaxesForward(originalBaseRaw, 0, true).totalPrice;
+			const M = calculateTaxesForward(originalBaseRaw, 1, true).totalPrice - T0;
+			const result = calculateTaxesForward(originalBaseRaw, M === 0 ? finalPriceWithTaxes - T0 : (finalPriceWithTaxes - T0) / M, false);
+			const adjustedFinalBase = finalPriceWithTaxes - result.totalTaxes;
+			amounts.unitBase = adjustedFinalBase;
+			amounts.total = finalPriceWithTaxes * quantity;
+			for (const t of result.firstTaxes) if (!t.excludeDiscount) {
+				t.base = adjustedFinalBase;
+				t.totalBase = adjustedFinalBase * quantity;
+			}
+			const firstTotal = sum(result.firstTaxes.map((t) => t.amount));
+			for (const t of result.latestTaxes) if (!t.excludeDiscount) {
+				t.base = adjustedFinalBase + firstTotal;
+				t.totalBase = t.base * quantity;
+			}
+			return {
+				id: item.id,
+				title: item.title,
+				taxIncluded: item.taxIncluded,
+				item: amounts,
+				taxes: [...result.firstTaxes, ...result.latestTaxes],
+				quantity,
+				product: item.product,
+				variant: item.variant,
+				discountAllocations: item.discountAllocations
+			};
+		}
+	};
+}
+function calcItems(items, parentDiscount = { amount: 0 }) {
+	return items.map(calcSingleItem(parentDiscount));
+}
+function buildInvoice(items) {
+	const base = sum(items.map((item) => item.item.unitBase * item.quantity));
+	const lineItemsSubtotalPrice = sum(items.filter((item) => !["_envio"].includes(item.id)).map((item) => item.item.price * item.quantity));
+	const shipping = sum(items.filter((item) => ["_envio"].includes(item.id)).map((item) => item.item.price * item.quantity));
+	const totalDiscount = sum(items.map((item) => {
+		const discounts = item.item.discounts;
+		if (!discounts) return 0;
+		return ((discounts.itemDiscount?.amount || 0) + (discounts.parentDiscount?.amount || 0)) * item.quantity;
+	}));
+	const imp = groupBy((tax) => {
+		return `${tax.type.code}_${tax.code}`;
+	}, flatten(items.map((item) => item.taxes)));
+	const _taxes = Object.values(imp).map((taxes) => {
+		let taxBase = 0;
+		let value = 0;
+		const type = taxes[0].type.code;
+		const title = taxes[0].type.name;
+		const code = taxes[0].code;
+		const rate = +taxes[0].value;
+		for (const iterator of taxes) {
+			taxBase += +iterator.totalBase;
+			value += +iterator.totalAmount;
+		}
+		return {
+			type,
+			code,
+			base: taxBase,
+			value,
+			rate,
+			title
+		};
+	});
+	return {
+		total: base + sum(_taxes.map((tax) => tax.value)),
+		totalTax: sum(_taxes.map((t) => t.value)),
+		totalDiscount,
+		base,
+		items,
+		taxes: _taxes,
+		lineItemsSubtotalPrice,
+		shipping
+	};
+}
+function calculateFormula(expression, variables) {
+	if (!/^[\w+\-*/().\s<>=?:&|"']+$/.test(expression)) throw new TypeError("Formula contains invalid characters");
+	const context = { ...variables };
+	try {
+		let processedExpression = expression;
+		for (const [key, value] of Object.entries(context)) {
+			const regex = new RegExp(`\\b${key}\\b`, "g");
+			const safeValue = typeof value === "string" ? `"${value}"` : String(value);
+			processedExpression = processedExpression.replace(regex, safeValue);
+		}
+		const result = new Function(`return ${processedExpression}`)();
+		if (typeof result !== "number" || Number.isNaN(result)) throw new TypeError("Formula result is not a valid number");
+		return result;
+	} catch (error) {
+		const errorMessage = error instanceof Error ? error.message : "Unknown error";
+		throw new Error(`Error evaluating formula "${expression}": ${errorMessage}`);
+	}
+}
+export { buildInvoice, calcAmount, calcItems, calcSingleItem, calculateFormula };

package/dist/server/router.d.mts

@@ -1,5 +1,5 @@
 import { Database, Store } from "../_chunks/db.mjs";
-import { Payment } from "../_chunks/index.mjs";
+import { Graphql, Payment } from "../_chunks/index.mjs";
 import { MiddlewareInputContext, MiddlewareOptions, StrictEndpoint } from "../_chunks/libs/better-call.mjs";
 import { H3, H3Event } from "h3";
 interface OptionsAccount$2 {
@@ -117,7 +117,7 @@ declare const _auth: import("better-auth").Auth<{
           $Infer: {
             body: {
               userId: string;
-              role: "admin" | "user" | ("admin" | "user")[];
+              role: "user" | "admin" | ("user" | "admin")[];
             };
           };
         };
@@ -206,7 +206,7 @@ declare const _auth: import("better-auth").Auth<{
               email: string;
               password?: string | undefined;
               name: string;
-              role?: "admin" | "user" | ("admin" | "user")[];
+              role?: "user" | "admin" | ("user" | "admin")[];
               data?: Record<string, any> | undefined;
             };
           };
@@ -829,7 +829,7 @@ declare const _auth: import("better-auth").Auth<{
               };
             } & {
               userId?: string | undefined;
-              role?: "admin" | "user";
+              role?: "user" | "admin";
             };
           };
         };
@@ -1162,6 +1162,7 @@ interface Product {
     id: any;
     originalPrice: number;
   }[];
+  noVariants?: boolean;
 }
 interface LineItemsCart {
   id: string;
@@ -1214,5 +1215,7 @@ declare function registerPayment(app: H3, db: Database, {
   preset,
   providerOptions,
   redirect: globalRedirect
-}: OptionsAccount): void;
+}: OptionsAccount): {
+  graphql: Graphql;
+};
 export { LineItemsCart, getCheckoutId, getTax, registerAccount, registerAuth, registerAuthMiddleware, registerCache, registerCart, registerCheckout, registerPayment, safeParams, useProducts, useUser };

package/dist/server/router.mjs

@@ -1,3 +1,4 @@
+import { buildInvoice, calcItems, calculateFormula } from "../_chunks/taxes.mjs";
 import { checkouts, customerAddresses, customerBillings, customerWhislists } from "../_chunks/database.mjs";
 import { GRAPHQL_TOKEN, TASKS_ENDPOINT, URL } from "./env.mjs";
 import { createGraphql, createPayment } from "../_chunks/lib.mjs";
@@ -191,6 +192,7 @@ function normalizeProduct(opts) {
 	return (product) => {
 		const image = product?.images?.[0];
 		const discount = product?.discount || 0;
+		console.log("product", product);
 		const options = product?.variants?.options?.map((option) => {
 			return {
 				id: option?.option?.name?.toLowerCase(),
@@ -209,7 +211,6 @@ function normalizeProduct(opts) {
 				sku: variant?.sku || product?.sku || "",
 				image: imageVariant || image,
 				price,
-				showPrice: priceWithTaxt(price),
 				priceWithTax: priceWithTaxt(price),
 				comparedPrice: product.comparedPrice,
 				title: product.title,
@@ -223,6 +224,7 @@ function normalizeProduct(opts) {
 			};
 		});
 		let price = product.price;
+		console.log({ price });
 		if (discount) price = calcPrice(price, discount);
 		const taxes = product.taxes?.length ? product.taxes.map((tax) => {
 			return {
@@ -236,7 +238,6 @@ function normalizeProduct(opts) {
 		return {
 			...product,
 			price,
-			showPrice: priceWithTaxt(price),
 			priceWithTax: priceWithTaxt(price),
 			comparedPrice: product.comparedPrice || priceWithTaxt(+(product.price || 0)),
 			image,
@@ -289,7 +290,17 @@ function useProducts(db) {
 				title: true,
 				variants: true,
 				extras: true,
-				discount: true
+				discount: true,
+				price: true,
+				comparedPrice: true,
+				sku: true,
+				description: true,
+				images: true,
+				slug: true,
+				subtitle: true,
+				type: true,
+				weight: true,
+				order: true
 			},
 			with: { taxes: {
 				columns: {
@@ -391,7 +402,8 @@ async function getLineItems(cart, getProducts) {
 				taxes: product.taxes,
 				category: product.extras?.category || "none",
 				originalPrice: variant?.originalPrice || product?.originalPrice || 0,
-				originalDiscount: product?.discount || 0
+				originalDiscount: product?.discount || 0,
+				noVariants: product.noVariants ?? void 0
 			};
 		});
 	});
@@ -444,219 +456,6 @@ function registerCart(app, { getProducts, path }) {
 		return await returnCart(event, cart, getProducts);
 	}));
 }
-function roundNum(v, r = 2) {
-	return Number(Number(v).toFixed(r));
-}
-function calcPercentaje(value, percentaje, hasInclude) {
-	const val = +value;
-	const per = +percentaje;
-	if (hasInclude) return roundNum(val * per / (100 + per));
-	else return roundNum(val / 100 * per);
-}
-function calcDiscount(amount, discount) {
-	if ("percent" in discount) return {
-		amount: calcPercentaje(amount, discount.percent),
-		percent: +discount.percent
-	};
-	else return { amount: +discount.amount };
-}
-const sum = (arr) => arr.reduce((a, b) => a + b, 0);
-const flatten = (arr) => arr.reduce((a, b) => a.concat(b), []);
-function groupBy(fn, arr) {
-	return arr.reduce((acc, value) => {
-		const key = fn(value);
-		if (!acc[key]) acc[key] = [];
-		acc[key].push(value);
-		return acc;
-	}, {});
-}
-function calcAmount(_itemDiscount, _parentDiscount, taxIncluded) {
-	return (price) => {
-		if (!taxIncluded) {
-			const itemDiscount = calcDiscount(price, _itemDiscount);
-			const parentDiscount = calcDiscount(price - itemDiscount.amount, _parentDiscount);
-			const unitBase = price - (itemDiscount.amount + parentDiscount.amount);
-			return {
-				price,
-				discounts: {
-					itemDiscount,
-					parentDiscount
-				},
-				unitAmount: unitBase,
-				unitBase
-			};
-		} else {
-			const parentDiscount = calcDiscount(price, _parentDiscount);
-			const itemDiscount = calcDiscount(price - parentDiscount.amount, _itemDiscount);
-			return {
-				price,
-				discounts: {
-					itemDiscount,
-					parentDiscount
-				},
-				unitAmount: price - (itemDiscount.amount + parentDiscount.amount),
-				unitBase: 0
-			};
-		}
-	};
-}
-function calcSingleItem(parentDiscount = { amount: 0 }) {
-	return (item) => {
-		const quantity = +item.quantity;
-		const taxes = item.taxes || [];
-		const calcRawTax = (base, rate) => base * rate / 100;
-		const calculateTaxesForward = (originalBase, finalBase, raw = false) => {
-			const firstTaxes = [];
-			const latestTaxes = [];
-			let totalFirstTaxesAmount = 0;
-			let totalLatestTaxesAmount = 0;
-			for (const t of taxes) if (t.beforeTaxes) {
-				const baseToUse = t.excludeDiscount ? originalBase : finalBase;
-				const amount = raw ? calcRawTax(baseToUse, +t.value) : calcPercentaje(baseToUse, t.value, false);
-				firstTaxes.push({
-					...t,
-					base: baseToUse,
-					amount,
-					totalBase: baseToUse * quantity,
-					totalAmount: amount * quantity
-				});
-				totalFirstTaxesAmount += amount;
-			}
-			for (const t of taxes) if (!t.beforeTaxes) {
-				const baseToUse = (t.excludeDiscount ? originalBase : finalBase) + totalFirstTaxesAmount;
-				const amount = raw ? calcRawTax(baseToUse, +t.value) : calcPercentaje(baseToUse, t.value, false);
-				latestTaxes.push({
-					...t,
-					base: baseToUse,
-					amount,
-					totalBase: baseToUse * quantity,
-					totalAmount: amount * quantity
-				});
-				totalLatestTaxesAmount += amount;
-			}
-			return {
-				firstTaxes,
-				latestTaxes,
-				totalTaxes: totalFirstTaxesAmount + totalLatestTaxesAmount,
-				totalPrice: finalBase + totalFirstTaxesAmount + totalLatestTaxesAmount
-			};
-		};
-		if (!item.taxIncluded) {
-			const amounts = calcAmount(item.discount, parentDiscount, false)(+item.price);
-			const originalBase = amounts.price;
-			const finalBase = amounts.unitBase;
-			const result = calculateTaxesForward(originalBase, finalBase, false);
-			amounts.total = amounts.unitBase * quantity + result.totalTaxes * quantity;
-			return {
-				id: item.id,
-				title: item.title,
-				taxIncluded: item.taxIncluded,
-				item: amounts,
-				taxes: [...result.firstTaxes, ...result.latestTaxes],
-				quantity,
-				product: item.product,
-				variant: item.variant,
-				discountAllocations: item.discountAllocations
-			};
-		} else {
-			const amounts = calcAmount(item.discount, parentDiscount, true)(+item.price);
-			const originalPriceWithTaxes = amounts.price;
-			const finalPriceWithTaxes = amounts.unitAmount;
-			const T1_1 = calculateTaxesForward(1, 1, true).totalPrice;
-			const originalBaseRaw = originalPriceWithTaxes / (T1_1 === 0 ? 1 : T1_1);
-			const T0 = calculateTaxesForward(originalBaseRaw, 0, true).totalPrice;
-			const M = calculateTaxesForward(originalBaseRaw, 1, true).totalPrice - T0;
-			const result = calculateTaxesForward(originalBaseRaw, M === 0 ? finalPriceWithTaxes - T0 : (finalPriceWithTaxes - T0) / M, false);
-			const adjustedFinalBase = finalPriceWithTaxes - result.totalTaxes;
-			amounts.unitBase = adjustedFinalBase;
-			amounts.total = finalPriceWithTaxes * quantity;
-			for (const t of result.firstTaxes) if (!t.excludeDiscount) {
-				t.base = adjustedFinalBase;
-				t.totalBase = adjustedFinalBase * quantity;
-			}
-			const firstTotal = sum(result.firstTaxes.map((t) => t.amount));
-			for (const t of result.latestTaxes) if (!t.excludeDiscount) {
-				t.base = adjustedFinalBase + firstTotal;
-				t.totalBase = t.base * quantity;
-			}
-			return {
-				id: item.id,
-				title: item.title,
-				taxIncluded: item.taxIncluded,
-				item: amounts,
-				taxes: [...result.firstTaxes, ...result.latestTaxes],
-				quantity,
-				product: item.product,
-				variant: item.variant,
-				discountAllocations: item.discountAllocations
-			};
-		}
-	};
-}
-function calcItems(items, parentDiscount = { amount: 0 }) {
-	return items.map(calcSingleItem(parentDiscount));
-}
-function buildInvoice(items) {
-	const base = sum(items.map((item) => item.item.unitBase * item.quantity));
-	const lineItemsSubtotalPrice = sum(items.filter((item) => !["_envio"].includes(item.id)).map((item) => item.item.price * item.quantity));
-	const shipping = sum(items.filter((item) => ["_envio"].includes(item.id)).map((item) => item.item.price * item.quantity));
-	const totalDiscount = sum(items.map((item) => {
-		const discounts = item.item.discounts;
-		if (!discounts) return 0;
-		return ((discounts.itemDiscount?.amount || 0) + (discounts.parentDiscount?.amount || 0)) * item.quantity;
-	}));
-	const imp = groupBy((tax) => {
-		return `${tax.type.code}_${tax.code}`;
-	}, flatten(items.map((item) => item.taxes)));
-	const _taxes = Object.values(imp).map((taxes) => {
-		let taxBase = 0;
-		let value = 0;
-		const type = taxes[0].type.code;
-		const title = taxes[0].type.name;
-		const code = taxes[0].code;
-		const rate = +taxes[0].value;
-		for (const iterator of taxes) {
-			taxBase += +iterator.totalBase;
-			value += +iterator.totalAmount;
-		}
-		return {
-			type,
-			code,
-			base: taxBase,
-			value,
-			rate,
-			title
-		};
-	});
-	return {
-		total: base + sum(_taxes.map((tax) => tax.value)),
-		totalTax: sum(_taxes.map((t) => t.value)),
-		totalDiscount,
-		base,
-		items,
-		taxes: _taxes,
-		lineItemsSubtotalPrice,
-		shipping
-	};
-}
-function calculateFormula(expression, variables) {
-	if (!/^[\w+\-*/().\s<>=?:&|"']+$/.test(expression)) throw new TypeError("Formula contains invalid characters");
-	const context = { ...variables };
-	try {
-		let processedExpression = expression;
-		for (const [key, value] of Object.entries(context)) {
-			const regex = new RegExp(`\\b${key}\\b`, "g");
-			const safeValue = typeof value === "string" ? `"${value}"` : String(value);
-			processedExpression = processedExpression.replace(regex, safeValue);
-		}
-		const result = new Function(`return ${processedExpression}`)();
-		if (typeof result !== "number" || Number.isNaN(result)) throw new TypeError("Formula result is not a valid number");
-		return result;
-	} catch (error) {
-		const errorMessage = error instanceof Error ? error.message : "Unknown error";
-		throw new Error(`Error evaluating formula "${expression}": ${errorMessage}`);
-	}
-}
 function getCheckoutId(event) {
 	const cookie = getCookie(event, "eCheckout");
 	if (!cookie) throw new HTTPError({
@@ -1054,8 +853,9 @@ const presets = { ecommerce: { prepare: { preHandle: async (event, payment) => {
 	event.context.card = card;
 } } } };
 function registerPayment(app, db, { path, storeId, providers, preset, providerOptions, redirect: globalRedirect }) {
+	const graphql = createGraphql(db);
 	const instance = createPayment({
-		graphql: createGraphql(db),
+		graphql,
 		storeId,
 		providers,
 		secret: "secret",
@@ -1153,5 +953,6 @@ function registerPayment(app, db, { path, storeId, providers, preset, providerOp
 		const provider = safeParams(event.context.params?.provider || "");
 		return await payment?.webhook?.(provider, uid, body);
 	}));
+	return { graphql };
 }
 export { getCheckoutId, getTax, registerAccount, registerAuth, registerAuthMiddleware, registerCache, registerCart, registerCheckout, registerPayment, safeParams, useProducts, useUser };