@endevops/peppol-schema 0.1.0-beta.4 → 0.1.0-beta.6

package/src/schematron/peppol/r/peppol-en16931-r007.ts

@@ -1,8 +1,7 @@
-import type { PeppolDocument } from '#/document';
+import type { PeppolDocument } from '#/schemas/peppol-document-schema';
 import type { SchematronRule } from '#/schematron/helpers';
-import type { SchematronRuleResult } from '#/schematron/types';
 
-import { getProfile, schematronResult } from '#/schematron/helpers';
+import { getProfile, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-EN16931-R007',
@@ -10,6 +9,8 @@ const rule = {
   message: "Business process MUST be in the format 'urn:fdc:peppol.eu:2017:poacc:billing:NN:1.0' where NN indicates the process number.",
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931R007(document: PeppolDocument): SchematronRuleResult {
-  return schematronResult(rule, getProfile(document) !== 'Unknown');
+function evaluatePeppolEn16931R007(document: PeppolDocument): boolean {
+  return getProfile(document) !== 'Unknown';
 }
+
+export const validatePeppolEn16931R007 = schematronRule(rule, evaluatePeppolEn16931R007);

package/src/schematron/peppol/r/peppol-en16931-r008.ts

@@ -1,8 +1,7 @@
-import type { PeppolDocument } from '#/document';
+import type { PeppolDocument } from '#/schemas/peppol-document-schema';
 import type { SchematronRule } from '#/schematron/helpers';
-import type { SchematronRuleResult } from '#/schematron/types';
 
-import { schematronResult } from '#/schematron/helpers';
+import { schematronRule } from '#/schematron/helpers';
 
 const rule = { id: 'PEPPOL-EN16931-R008', level: 'fatal', message: 'Document MUST not contain empty elements.' } as const satisfies SchematronRule;
 
@@ -22,6 +21,8 @@ function containsEmptyElement(value: unknown): boolean {
   return false;
 }
 
-export function validatePeppolEn16931R008(document: PeppolDocument): SchematronRuleResult {
-  return schematronResult(rule, !containsEmptyElement(document));
+function evaluatePeppolEn16931R008(document: PeppolDocument): boolean {
+  return !containsEmptyElement(document);
 }
+
+export const validatePeppolEn16931R008 = schematronRule(rule, evaluatePeppolEn16931R008);

package/src/schematron/peppol/r/peppol-en16931-r010.ts

@@ -1,12 +1,13 @@
-import type { PeppolDocument } from '#/document';
+import type { PeppolDocument } from '#/schemas/peppol-document-schema';
 import type { SchematronRule } from '#/schematron/helpers';
-import type { SchematronRuleResult } from '#/schematron/types';
 
-import { schematronResult } from '#/schematron/helpers';
+import { schematronRule } from '#/schematron/helpers';
 
 const rule = { id: 'PEPPOL-EN16931-R010', level: 'fatal', message: 'Buyer electronic address MUST be provided' } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931R010(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931R010(document: PeppolDocument): boolean {
   const endpointId = document.accountingCustomerParty.endpointId?.id;
-  return schematronResult(rule, typeof endpointId === 'string' && endpointId.trim() !== '');
+  return typeof endpointId === 'string' && endpointId.trim() !== '';
 }
+
+export const validatePeppolEn16931R010 = schematronRule(rule, evaluatePeppolEn16931R010);

package/src/schematron/peppol/r/peppol-en16931-r020.ts

@@ -1,12 +1,13 @@
-import type { PeppolDocument } from '#/document';
+import type { PeppolDocument } from '#/schemas/peppol-document-schema';
 import type { SchematronRule } from '#/schematron/helpers';
-import type { SchematronRuleResult } from '#/schematron/types';
 
-import { schematronResult } from '#/schematron/helpers';
+import { schematronRule } from '#/schematron/helpers';
 
 const rule = { id: 'PEPPOL-EN16931-R020', level: 'fatal', message: 'Seller electronic address MUST be provided' } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931R020(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931R020(document: PeppolDocument): boolean {
   const endpointId = document.accountingSupplierParty.endpointId?.id;
-  return schematronResult(rule, typeof endpointId === 'string' && endpointId.trim() !== '');
+  return typeof endpointId === 'string' && endpointId.trim() !== '';
 }
+
+export const validatePeppolEn16931R020 = schematronRule(rule, evaluatePeppolEn16931R020);

package/src/schematron/peppol/r/peppol-en16931-r040.ts

@@ -1,8 +1,7 @@
-import type { PeppolDocument } from '#/document';
+import type { PeppolDocument } from '#/schemas/peppol-document-schema';
 import type { SchematronRule } from '#/schematron/helpers';
-import type { SchematronRuleResult } from '#/schematron/types';
 
-import { getAllAllowanceCharges, schematronResult, slack } from '#/schematron/helpers';
+import { getAllAllowanceCharges, schematronRule, slack } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-EN16931-R040',
@@ -10,7 +9,7 @@ const rule = {
   message: 'Allowance/charge amount must equal base amount * percentage/100 if base amount and percentage exists',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931R040(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931R040(document: PeppolDocument): boolean {
   const allowanceCharges = getAllAllowanceCharges(document);
   const passed = allowanceCharges.every(ac => {
     if (!ac.multiplierFactorNumeric || ac.baseAmount === undefined) {
@@ -19,5 +18,7 @@ export function validatePeppolEn16931R040(document: PeppolDocument): SchematronR
     const expected = (ac.baseAmount * ac.multiplierFactorNumeric) / 100;
     return slack(expected, ac.amount ?? 0, 0.02);
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931R040 = schematronRule(rule, evaluatePeppolEn16931R040);

package/src/schematron/peppol/r/peppol-en16931-r041.ts

@@ -1,8 +1,7 @@
-import type { PeppolDocument } from '#/document';
+import type { PeppolDocument } from '#/schemas/peppol-document-schema';
 import type { SchematronRule } from '#/schematron/helpers';
-import type { SchematronRuleResult } from '#/schematron/types';
 
-import { getAllAllowanceCharges, schematronResult } from '#/schematron/helpers';
+import { getAllAllowanceCharges, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-EN16931-R041',
@@ -10,8 +9,10 @@ const rule = {
   message: 'Allowance/charge base amount MUST be provided when allowance/charge percentage is provided.',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931R041(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931R041(document: PeppolDocument): boolean {
   const allowanceCharges = getAllAllowanceCharges(document);
   const passed = allowanceCharges.every(ac => !ac.multiplierFactorNumeric || ac.baseAmount !== undefined);
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931R041 = schematronRule(rule, evaluatePeppolEn16931R041);

package/src/schematron/peppol/r/peppol-en16931-r042.ts

@@ -1,8 +1,7 @@
-import type { PeppolDocument } from '#/document';
+import type { PeppolDocument } from '#/schemas/peppol-document-schema';
 import type { SchematronRule } from '#/schematron/helpers';
-import type { SchematronRuleResult } from '#/schematron/types';
 
-import { getAllAllowanceCharges, schematronResult } from '#/schematron/helpers';
+import { getAllAllowanceCharges, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-EN16931-R042',
@@ -10,8 +9,10 @@ const rule = {
   message: 'Allowance/charge percentage MUST be provided when allowance/charge base amount is provided.',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931R042(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931R042(document: PeppolDocument): boolean {
   const allowanceCharges = getAllAllowanceCharges(document);
   const passed = allowanceCharges.every(ac => ac.baseAmount === undefined || Boolean(ac.multiplierFactorNumeric));
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931R042 = schematronRule(rule, evaluatePeppolEn16931R042);

package/src/schematron/peppol/r/peppol-en16931-r043.ts

@@ -1,8 +1,7 @@
-import type { PeppolDocument } from '#/document';
+import type { PeppolDocument } from '#/schemas/peppol-document-schema';
 import type { SchematronRule } from '#/schematron/helpers';
-import type { SchematronRuleResult } from '#/schematron/types';
 
-import { getAllAllowanceCharges, schematronResult } from '#/schematron/helpers';
+import { getAllAllowanceCharges, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-EN16931-R043',
@@ -10,8 +9,10 @@ const rule = {
   message: "Allowance/charge ChargeIndicator value MUST equal 'true' or 'false'",
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931R043(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931R043(document: PeppolDocument): boolean {
   const allowanceCharges = getAllAllowanceCharges(document);
   const passed = allowanceCharges.every(ac => typeof ac.chargeIndicator === 'boolean');
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931R043 = schematronRule(rule, evaluatePeppolEn16931R043);

package/src/schematron/peppol/r/peppol-en16931-r044.ts

@@ -1,8 +1,7 @@
-import type { PeppolDocument } from '#/document';
+import type { PeppolDocument } from '#/schemas/peppol-document-schema';
 import type { SchematronRule } from '#/schematron/helpers';
-import type { SchematronRuleResult } from '#/schematron/types';
 
-import { getLines, schematronResult } from '#/schematron/helpers';
+import { getLines, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-EN16931-R044',
@@ -10,7 +9,9 @@ const rule = {
   message: "Charge on price level is NOT allowed. Only value 'false' allowed.",
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931R044(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931R044(document: PeppolDocument): boolean {
   const passed = getLines(document).every(line => !line.price.allowanceCharge || !line.price.allowanceCharge.chargeIndicator);
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931R044 = schematronRule(rule, evaluatePeppolEn16931R044);

package/src/schematron/peppol/r/peppol-en16931-r046.ts

@@ -1,8 +1,7 @@
-import type { PeppolDocument } from '#/document';
+import type { PeppolDocument } from '#/schemas/peppol-document-schema';
 import type { SchematronRule } from '#/schematron/helpers';
-import type { SchematronRuleResult } from '#/schematron/types';
 
-import { getLines, schematronResult, slack } from '#/schematron/helpers';
+import { getLines, schematronRule, slack } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-EN16931-R046',
@@ -10,7 +9,7 @@ const rule = {
   message: 'Item net price MUST equal (Gross price - Allowance amount) when gross price is provided.',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931R046(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931R046(document: PeppolDocument): boolean {
   const passed = getLines(document).every(line => {
     const price = line.price;
     const allowance = price.allowanceCharge;
@@ -19,5 +18,7 @@ export function validatePeppolEn16931R046(document: PeppolDocument): SchematronR
     }
     return slack(allowance.baseAmount.value - (allowance.amount?.value ?? 0), price.priceAmount.value, 0.02);
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931R046 = schematronRule(rule, evaluatePeppolEn16931R046);

package/src/schematron/peppol/r/peppol-en16931-r051.ts

@@ -1,8 +1,7 @@
-import type { PeppolDocument } from '#/document';
+import type { PeppolDocument } from '#/schemas/peppol-document-schema';
 import type { SchematronRule } from '#/schematron/helpers';
-import type { SchematronRuleResult } from '#/schematron/types';
 
-import { getLines, schematronResult } from '#/schematron/helpers';
+import { getLines, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-EN16931-R051',
@@ -11,20 +10,34 @@ const rule = {
     'All currencyID attributes must have the same value as the invoice currency code (BT-5), except for the invoice total VAT amount in accounting currency (BT-111).',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931R051(document: PeppolDocument): SchematronRuleResult {
-  const documentCurrency = document.documentCurrencyCode;
-  const checkCurrency = (currencyId: string | undefined): boolean => currencyId === documentCurrency;
+interface CurrencyAmount {
+  currencyId: string;
+}
 
-  const documentAllowancesOk = (document.allowanceCharges ?? []).every(
-    ac => checkCurrency(ac.amount?.currencyId) && (!ac.baseAmount || checkCurrency(ac.baseAmount.currencyId))
-  );
+interface AllowanceChargeAmounts {
+  amount?: CurrencyAmount | undefined;
+  baseAmount?: CurrencyAmount | undefined;
+}
 
-  const linesOk = getLines(document).every(line => {
-    const lineAllowancesOk = (line.allowanceCharges ?? []).every(
-      ac => checkCurrency(ac.amount?.currencyId) && (!ac.baseAmount || checkCurrency(ac.baseAmount.currencyId))
-    );
-    return checkCurrency(line.price.priceAmount.currencyId) && checkCurrency(line.lineExtensionAmount.currencyId) && lineAllowancesOk;
-  });
+const matchesCurrency = (amount: CurrencyAmount | undefined, expected: string): boolean => amount?.currencyId === expected;
+
+const optionalMatchesCurrency = (amount: CurrencyAmount | undefined, expected: string): boolean =>
+  amount === undefined || matchesCurrency(amount, expected);
+
+const allowanceChargeMatchesCurrency = (allowanceCharge: AllowanceChargeAmounts, expected: string): boolean =>
+  matchesCurrency(allowanceCharge.amount, expected) && optionalMatchesCurrency(allowanceCharge.baseAmount, expected);
+
+function evaluatePeppolEn16931R051(document: PeppolDocument): boolean {
+  const currency = document.documentCurrencyCode;
+
+  const documentAllowancesOk = (document.allowanceCharges ?? []).every(allowanceCharge => allowanceChargeMatchesCurrency(allowanceCharge, currency));
+
+  const linesOk = getLines(document).every(
+    line =>
+      matchesCurrency(line.price.priceAmount, currency) &&
+      matchesCurrency(line.lineExtensionAmount, currency) &&
+      (line.allowanceCharges ?? []).every(allowanceCharge => allowanceChargeMatchesCurrency(allowanceCharge, currency))
+  );
 
   const taxTotalsOk = document.taxTotals.every(total => {
     // Only tax totals with subtotals are in scope for BT-110; the accounting currency total (BT-111) is excluded.
@@ -32,21 +45,29 @@ export function validatePeppolEn16931R051(document: PeppolDocument): SchematronR
       return true;
     }
     return (
-      checkCurrency(total.taxAmount.currencyId) &&
-      (total.taxSubtotals ?? []).every(st => checkCurrency(st.taxAmount.currencyId) && checkCurrency(st.taxableAmount.currencyId))
+      matchesCurrency(total.taxAmount, currency) &&
+      (total.taxSubtotals ?? []).every(subtotal => matchesCurrency(subtotal.taxAmount, currency) && matchesCurrency(subtotal.taxableAmount, currency))
     );
   });
 
   const totals = document.legalMonetaryTotal;
+  const requiredTotals: Array<CurrencyAmount> = [
+    totals.lineExtensionAmount,
+    totals.taxExclusiveAmount,
+    totals.taxInclusiveAmount,
+    totals.payableAmount,
+  ];
+  const optionalTotals: Array<CurrencyAmount | undefined> = [
+    totals.allowanceTotalAmount,
+    totals.chargeTotalAmount,
+    totals.prepaidAmount,
+    totals.payableRoundingAmount,
+  ];
+
   const totalsOk =
-    checkCurrency(totals.lineExtensionAmount.currencyId) &&
-    checkCurrency(totals.taxExclusiveAmount.currencyId) &&
-    checkCurrency(totals.taxInclusiveAmount.currencyId) &&
-    (!totals.allowanceTotalAmount || checkCurrency(totals.allowanceTotalAmount.currencyId)) &&
-    (!totals.chargeTotalAmount || checkCurrency(totals.chargeTotalAmount.currencyId)) &&
-    (!totals.prepaidAmount || checkCurrency(totals.prepaidAmount.currencyId)) &&
-    (!totals.payableRoundingAmount || checkCurrency(totals.payableRoundingAmount.currencyId)) &&
-    checkCurrency(totals.payableAmount.currencyId);
-
-  return schematronResult(rule, documentAllowancesOk && linesOk && taxTotalsOk && totalsOk);
+    requiredTotals.every(amount => matchesCurrency(amount, currency)) && optionalTotals.every(amount => optionalMatchesCurrency(amount, currency));
+
+  return documentAllowancesOk && linesOk && taxTotalsOk && totalsOk;
 }
+
+export const validatePeppolEn16931R051 = schematronRule(rule, evaluatePeppolEn16931R051);

package/src/schematron/peppol/r/peppol-en16931-r053.ts

@@ -1,8 +1,7 @@
-import type { PeppolDocument } from '#/document';
+import type { PeppolDocument } from '#/schemas/peppol-document-schema';
 import type { SchematronRule } from '#/schematron/helpers';
-import type { SchematronRuleResult } from '#/schematron/types';
 
-import { schematronResult } from '#/schematron/helpers';
+import { schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-EN16931-R053',
@@ -10,7 +9,9 @@ const rule = {
   message: 'Only one tax total with tax subtotals MUST be provided.',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931R053(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931R053(document: PeppolDocument): boolean {
   const withSubtotals = document.taxTotals.filter(total => (total.taxSubtotals?.length ?? 0) > 0);
-  return schematronResult(rule, withSubtotals.length === 1);
+  return withSubtotals.length === 1;
 }
+
+export const validatePeppolEn16931R053 = schematronRule(rule, evaluatePeppolEn16931R053);

package/src/schematron/peppol/r/peppol-en16931-r054.ts

@@ -1,8 +1,7 @@
-import type { PeppolDocument } from '#/document';
+import type { PeppolDocument } from '#/schemas/peppol-document-schema';
 import type { SchematronRule } from '#/schematron/helpers';
-import type { SchematronRuleResult } from '#/schematron/types';
 
-import { schematronResult } from '#/schematron/helpers';
+import { schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-EN16931-R054',
@@ -10,8 +9,10 @@ const rule = {
   message: 'Only one tax total without tax subtotals MUST be provided when tax currency code is provided.',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931R054(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931R054(document: PeppolDocument): boolean {
   const withoutSubtotals = document.taxTotals.filter(total => (total.taxSubtotals?.length ?? 0) === 0);
   const expected = document.taxCurrencyCode ? 1 : 0;
-  return schematronResult(rule, withoutSubtotals.length === expected);
+  return withoutSubtotals.length === expected;
 }
+
+export const validatePeppolEn16931R054 = schematronRule(rule, evaluatePeppolEn16931R054);

package/src/schematron/peppol/r/peppol-en16931-r055.ts

@@ -1,8 +1,7 @@
-import type { PeppolDocument } from '#/document';
+import type { PeppolDocument } from '#/schemas/peppol-document-schema';
 import type { SchematronRule } from '#/schematron/helpers';
-import type { SchematronRuleResult } from '#/schematron/types';
 
-import { schematronResult } from '#/schematron/helpers';
+import { schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-EN16931-R055',
@@ -10,17 +9,19 @@ const rule = {
   message: 'Invoice total VAT amount and Invoice total VAT amount in accounting currency MUST have the same operational sign',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931R055(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931R055(document: PeppolDocument): boolean {
   const taxCurrency = document.taxCurrencyCode;
   if (!taxCurrency) {
-    return schematronResult(rule, true);
+    return true;
   }
   const documentCurrencyAmount = document.taxTotals.find(total => total.taxAmount.currencyId === document.documentCurrencyCode)?.taxAmount.value;
   const taxCurrencyAmount = document.taxTotals.find(total => total.taxAmount.currencyId === taxCurrency)?.taxAmount.value;
   if (typeof documentCurrencyAmount !== 'number' || typeof taxCurrencyAmount !== 'number') {
-    return schematronResult(rule, false);
+    return false;
   }
   const bothNonPositive = documentCurrencyAmount <= 0 && taxCurrencyAmount <= 0;
   const bothNonNegative = documentCurrencyAmount >= 0 && taxCurrencyAmount >= 0;
-  return schematronResult(rule, bothNonPositive || bothNonNegative);
+  return bothNonPositive || bothNonNegative;
 }
+
+export const validatePeppolEn16931R055 = schematronRule(rule, evaluatePeppolEn16931R055);

package/src/schematron/peppol/r/peppol-en16931-r061.ts

@@ -1,8 +1,7 @@
-import type { PeppolDocument } from '#/document';
+import type { PeppolDocument } from '#/schemas/peppol-document-schema';
 import type { SchematronRule } from '#/schematron/helpers';
-import type { SchematronRuleResult } from '#/schematron/types';
 
-import { schematronResult } from '#/schematron/helpers';
+import { schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-EN16931-R061',
@@ -12,7 +11,7 @@ const rule = {
 
 const DIRECT_DEBIT_CODES = new Set(['49', '59']);
 
-export function validatePeppolEn16931R061(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931R061(document: PeppolDocument): boolean {
   const passed = (document.paymentMeans ?? []).every(payment => {
     if (!DIRECT_DEBIT_CODES.has(payment.paymentMeansCode.code)) {
       return true;
@@ -20,5 +19,7 @@ export function validatePeppolEn16931R061(document: PeppolDocument): SchematronR
     const mandateId = payment.paymentMandate?.id;
     return typeof mandateId === 'string' && mandateId.trim() !== '';
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931R061 = schematronRule(rule, evaluatePeppolEn16931R061);

package/src/schematron/peppol/r/peppol-en16931-r100.ts

@@ -1,12 +1,13 @@
-import type { PeppolDocument } from '#/document';
+import type { PeppolDocument } from '#/schemas/peppol-document-schema';
 import type { SchematronRule } from '#/schematron/helpers';
-import type { SchematronRuleResult } from '#/schematron/types';
 
-import { getLines, schematronResult } from '#/schematron/helpers';
+import { getLines, schematronRule } from '#/schematron/helpers';
 
 const rule = { id: 'PEPPOL-EN16931-R100', level: 'fatal', message: 'Only one invoiced object is allowed pr line' } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931R100(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931R100(document: PeppolDocument): boolean {
   const passed = getLines(document).every(line => (line.documentReference?.length ?? 0) <= 1);
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931R100 = schematronRule(rule, evaluatePeppolEn16931R100);

package/src/schematron/peppol/r/peppol-en16931-r101.ts

@@ -1,8 +1,7 @@
-import type { PeppolDocument } from '#/document';
+import type { PeppolDocument } from '#/schemas/peppol-document-schema';
 import type { SchematronRule } from '#/schematron/helpers';
-import type { SchematronRuleResult } from '#/schematron/types';
 
-import { getLines, schematronResult } from '#/schematron/helpers';
+import { getLines, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-EN16931-R101',
@@ -10,10 +9,12 @@ const rule = {
   message: 'Element Document reference can only be used for Invoice line object',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931R101(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931R101(document: PeppolDocument): boolean {
   const passed = getLines(document).every(line => {
     const references = line.documentReference ?? [];
     return references.every(ref => ref.documentTypeCode === '130');
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931R101 = schematronRule(rule, evaluatePeppolEn16931R101);

package/src/schematron/peppol/r/peppol-en16931-r110.ts

@@ -1,8 +1,7 @@
-import type { PeppolDocument } from '#/document';
+import type { PeppolDocument } from '#/schemas/peppol-document-schema';
 import type { SchematronRule } from '#/schematron/helpers';
-import type { SchematronRuleResult } from '#/schematron/types';
 
-import { getLines, schematronResult } from '#/schematron/helpers';
+import { getLines, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-EN16931-R110',
@@ -10,14 +9,16 @@ const rule = {
   message: 'Start date of line period MUST be within invoice period.',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931R110(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931R110(document: PeppolDocument): boolean {
   const invoicePeriodStart = document.invoicePeriod?.startDate;
   if (!invoicePeriodStart) {
-    return schematronResult(rule, true);
+    return true;
   }
   const passed = getLines(document).every(line => {
     const lineStart = line.invoicePeriod?.startDate;
     return !lineStart || lineStart >= invoicePeriodStart;
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931R110 = schematronRule(rule, evaluatePeppolEn16931R110);

package/src/schematron/peppol/r/peppol-en16931-r111.ts

@@ -1,8 +1,7 @@
-import type { PeppolDocument } from '#/document';
+import type { PeppolDocument } from '#/schemas/peppol-document-schema';
 import type { SchematronRule } from '#/schematron/helpers';
-import type { SchematronRuleResult } from '#/schematron/types';
 
-import { getLines, schematronResult } from '#/schematron/helpers';
+import { getLines, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-EN16931-R111',
@@ -10,14 +9,16 @@ const rule = {
   message: 'End date of line period MUST be within invoice period.',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931R111(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931R111(document: PeppolDocument): boolean {
   const invoicePeriodEnd = document.invoicePeriod?.endDate;
   if (!invoicePeriodEnd) {
-    return schematronResult(rule, true);
+    return true;
   }
   const passed = getLines(document).every(line => {
     const lineEnd = line.invoicePeriod?.endDate;
     return !lineEnd || lineEnd <= invoicePeriodEnd;
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931R111 = schematronRule(rule, evaluatePeppolEn16931R111);

package/src/schematron/peppol/r/peppol-en16931-r120.ts

@@ -1,8 +1,7 @@
-import type { PeppolDocument } from '#/document';
+import type { PeppolDocument } from '#/schemas/peppol-document-schema';
 import type { SchematronRule } from '#/schematron/helpers';
-import type { SchematronRuleResult } from '#/schematron/types';
 
-import { getLineQuantity, getLines, schematronResult, slack } from '#/schematron/helpers';
+import { getLineQuantity, getLines, schematronRule, slack } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-EN16931-R120',
@@ -11,7 +10,7 @@ const rule = {
     'Invoice line net amount MUST equal (Invoiced quantity * (Item net price/item price base quantity) + Sum of invoice line charge amount - sum of invoice line allowance amount',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931R120(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931R120(document: PeppolDocument): boolean {
   const passed = getLines(document).every(line => {
     const lineExtensionAmount = line.lineExtensionAmount.value;
     const quantity = getLineQuantity(line);
@@ -22,5 +21,7 @@ export function validatePeppolEn16931R120(document: PeppolDocument): SchematronR
     const expected = quantity * (priceAmount / baseQuantity) + chargesTotal - allowancesTotal;
     return slack(expected, lineExtensionAmount, 0.02);
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931R120 = schematronRule(rule, evaluatePeppolEn16931R120);

package/src/schematron/peppol/r/peppol-en16931-r121.ts

@@ -1,8 +1,7 @@
-import type { PeppolDocument } from '#/document';
+import type { PeppolDocument } from '#/schemas/peppol-document-schema';
 import type { SchematronRule } from '#/schematron/helpers';
-import type { SchematronRuleResult } from '#/schematron/types';
 
-import { getLines, schematronResult } from '#/schematron/helpers';
+import { getLines, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-EN16931-R121',
@@ -10,10 +9,12 @@ const rule = {
   message: 'Base quantity MUST be a positive number above zero.',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931R121(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931R121(document: PeppolDocument): boolean {
   const passed = getLines(document).every(line => {
     const baseQuantity = line.price.baseQuantity?.value;
     return baseQuantity === undefined || baseQuantity > 0;
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931R121 = schematronRule(rule, evaluatePeppolEn16931R121);