@voyantjs/finance 0.77.4 → 0.77.8

package/dist/service-issue.d.ts

@@ -62,8 +62,11 @@ export interface InvoiceIssuedLineItem {
     unitPrice: number;
     currency: string;
     taxPercentage?: number;
+    taxName?: string | null;
+    taxRegimeCode?: TaxRegimeCode | null;
     isService?: boolean;
 }
+export type TaxRegimeCode = "standard" | "reduced" | "exempt" | "reverse_charge" | "margin_scheme_art311" | "zero_rated" | "out_of_scope" | "other";
 /**
  * Create + emit an invoice from a booking. Returns the persisted row
  * after flipping the status from `draft` → `sent`. The status flip is

package/dist/service-issue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service-issue.d.ts","sourceRoot":"","sources":["../src/service-issue.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service-issue.d.ts","sourceRoot":"","sources":["../src/service-issue.ts"],"names":[],"mappings":"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"}

package/dist/service-issue.js

@@ -1,9 +1,20 @@
 import { appendActionLedgerMutation, } from "@voyantjs/action-ledger";
-import { bookings } from "@voyantjs/bookings/schema";
-import { asc, eq } from "drizzle-orm";
+import { bookingItems, bookings } from "@voyantjs/bookings/schema";
+import { asc, eq, inArray } from "drizzle-orm";
+import { resolveBookingSellTaxRate } from "./booking-tax.js";
 import { resolveInvoiceFxContext } from "./invoice-fx.js";
-import { invoiceLineItems, invoiceNumberSeries, invoices, payments } from "./schema.js";
+import { bookingItemTaxLines, invoiceLineItems, invoiceNumberSeries, invoices, payments, } from "./schema.js";
 import { buildInvoiceIssuedActionLedgerInput, financeService, } from "./service.js";
+const TAX_REGIME_CODES = new Set([
+    "standard",
+    "reduced",
+    "exempt",
+    "reverse_charge",
+    "margin_scheme_art311",
+    "zero_rated",
+    "out_of_scope",
+    "other",
+]);
 const ISSUED_EVENT = "invoice.issued";
 const PROFORMA_ISSUED_EVENT = "invoice.proforma.issued";
 /**
@@ -84,6 +95,7 @@ async function emitIssued(db, runtime, eventName, invoice) {
         .from(invoiceLineItems)
         .where(eq(invoiceLineItems.invoiceId, invoice.id))
         .orderBy(asc(invoiceLineItems.sortOrder));
+    const taxMetadataByBookingItemId = await loadLineTaxMetadata(db, lines);
     const payload = {
         invoiceId: invoice.id,
         invoiceNumber: invoice.invoiceNumber,
@@ -101,14 +113,20 @@ async function emitIssued(db, runtime, eventName, invoice) {
         clientCountry: booking?.contactCountry ?? null,
         clientVatCode: null,
         clientRegCom: null,
-        lineItems: lines.map((line) => ({
-            description: line.description,
-            quantity: line.quantity,
-            unitPrice: centsToMajor(line.unitPriceCents),
-            currency: invoice.currency,
-            ...(line.taxRate == null ? {} : { taxPercentage: line.taxRate }),
-            isService: true,
-        })),
+        lineItems: lines.map((line) => {
+            const taxMetadata = line.bookingItemId == null ? undefined : taxMetadataByBookingItemId.get(line.bookingItemId);
+            const taxPercentage = line.taxRate ?? taxMetadata?.taxPercentage;
+            return {
+                description: line.description,
+                quantity: line.quantity,
+                unitPrice: centsToMajor(line.unitPriceCents),
+                currency: invoice.currency,
+                ...(taxPercentage == null ? {} : { taxPercentage }),
+                ...(taxMetadata?.taxName == null ? {} : { taxName: taxMetadata.taxName }),
+                ...(taxMetadata?.taxRegimeCode == null ? {} : { taxRegimeCode: taxMetadata.taxRegimeCode }),
+                isService: true,
+            };
+        }),
         bookingNumber: booking?.bookingNumber ?? null,
         issueDate: toDateString(invoice.issueDate),
         dueDate: toDateString(invoice.dueDate),
@@ -125,6 +143,78 @@ async function emitIssued(db, runtime, eventName, invoice) {
         Object.assign(payload, fx);
     await runtime.eventBus.emit(eventName, payload);
 }
+async function loadLineTaxMetadata(db, lines) {
+    const bookingItemIds = [
+        ...new Set(lines.map((line) => line.bookingItemId).filter((id) => Boolean(id))),
+    ];
+    if (bookingItemIds.length === 0)
+        return new Map();
+    const taxLines = await db
+        .select({
+        bookingItemId: bookingItemTaxLines.bookingItemId,
+        name: bookingItemTaxLines.name,
+        code: bookingItemTaxLines.code,
+        scope: bookingItemTaxLines.scope,
+        rateBasisPoints: bookingItemTaxLines.rateBasisPoints,
+    })
+        .from(bookingItemTaxLines)
+        .where(inArray(bookingItemTaxLines.bookingItemId, bookingItemIds))
+        .orderBy(asc(bookingItemTaxLines.bookingItemId), asc(bookingItemTaxLines.sortOrder), asc(bookingItemTaxLines.createdAt));
+    const taxLinesByBookingItemId = new Map();
+    for (const taxLine of taxLines) {
+        const existing = taxLinesByBookingItemId.get(taxLine.bookingItemId) ?? [];
+        existing.push(taxLine);
+        taxLinesByBookingItemId.set(taxLine.bookingItemId, existing);
+    }
+    const metadataByBookingItemId = new Map();
+    for (const bookingItemId of bookingItemIds) {
+        const taxLine = selectEventTaxLine(taxLinesByBookingItemId.get(bookingItemId) ?? []);
+        if (!taxLine)
+            continue;
+        metadataByBookingItemId.set(bookingItemId, {
+            ...(taxLine.rateBasisPoints == null
+                ? {}
+                : { taxPercentage: Math.round(taxLine.rateBasisPoints / 100) }),
+            taxName: taxLine.name,
+            taxRegimeCode: parseTaxRegimeCode(taxLine.code),
+        });
+    }
+    await backfillMissingLineTaxMetadata(db, bookingItemIds, metadataByBookingItemId);
+    return metadataByBookingItemId;
+}
+function selectEventTaxLine(taxLines) {
+    return (taxLines.find((taxLine) => taxLine.scope !== "withheld" && taxLine.rateBasisPoints != null) ??
+        taxLines.find((taxLine) => taxLine.scope !== "withheld") ??
+        null);
+}
+async function backfillMissingLineTaxMetadata(db, bookingItemIds, metadataByBookingItemId) {
+    const missingBookingItemIds = bookingItemIds.filter((id) => !metadataByBookingItemId.has(id));
+    if (missingBookingItemIds.length === 0)
+        return;
+    const productRows = await db
+        .select({
+        id: bookingItems.id,
+        productId: bookingItems.productId,
+    })
+        .from(bookingItems)
+        .where(inArray(bookingItems.id, missingBookingItemIds));
+    for (const row of productRows) {
+        if (!row.productId)
+            continue;
+        const taxRate = await resolveBookingSellTaxRate(db, { productId: row.productId });
+        if (!taxRate)
+            continue;
+        metadataByBookingItemId.set(row.id, {
+            taxPercentage: Math.round(taxRate.rate * 100),
+            taxName: taxRate.label,
+            taxRegimeCode: parseTaxRegimeCode(taxRate.code),
+        });
+    }
+}
+function parseTaxRegimeCode(code) {
+    const value = code?.split("/").at(-1);
+    return value && TAX_REGIME_CODES.has(value) ? value : null;
+}
 /**
  * Convert an issued proforma into a final invoice. Copies the proforma's
  * line items verbatim (totals + taxes already match the booking the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voyantjs/finance",
-  "version": "0.77.4",
+  "version": "0.77.8",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {
@@ -59,14 +59,14 @@
     "drizzle-orm": "^0.45.2",
     "hono": "^4.12.10",
     "zod": "^4.3.6",
-    "@voyantjs/action-ledger": "0.77.4",
-    "@voyantjs/bookings": "0.77.4",
-    "@voyantjs/core": "0.77.4",
-    "@voyantjs/db": "0.77.4",
-    "@voyantjs/hono": "0.77.4",
-    "@voyantjs/products": "0.77.4",
-    "@voyantjs/utils": "0.77.4",
-    "@voyantjs/storage": "0.77.4"
+    "@voyantjs/action-ledger": "0.77.8",
+    "@voyantjs/bookings": "0.77.8",
+    "@voyantjs/core": "0.77.8",
+    "@voyantjs/db": "0.77.8",
+    "@voyantjs/hono": "0.77.8",
+    "@voyantjs/products": "0.77.8",
+    "@voyantjs/utils": "0.77.8",
+    "@voyantjs/storage": "0.77.8"
   },
   "devDependencies": {
     "typescript": "^6.0.2",