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

package/src/schematron/cen/cen-en16931-br-64.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: 'CEN-EN16931-BR-64',
@@ -10,9 +9,11 @@ const rule = {
   message: 'The Item standard identifier (BT-157) shall have a Scheme identifier.',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br64(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br64(document: PeppolDocument): boolean {
   const passed = getLines(document).every(
     line => !line.item.standardItemIdentification || typeof line.item.standardItemIdentification.id.schemeId === 'string'
   );
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931Br64 = schematronRule(rule, evaluateCenEn16931Br64);

package/src/schematron/cen/cen-en16931-br-65.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: 'CEN-EN16931-BR-65',
@@ -10,9 +9,11 @@ const rule = {
   message: 'The Item classification identifier (BT-158) shall have a Scheme identifier.',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br65(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br65(document: PeppolDocument): boolean {
   const passed = getLines(document).every(line =>
     (line.item.commodityClassifications ?? []).every(cc => typeof cc.itemClassification.listId === 'string')
   );
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931Br65 = schematronRule(rule, evaluateCenEn16931Br65);

package/src/schematron/cen/cl/cen-en16931-br-cl-08.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 { noteSubjectCodeIsUncl4451, schematronResult } from '#/schematron/helpers';
+import { noteSubjectCodeIsUncl4451, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'CEN-EN16931-BR-CL-08',
@@ -10,7 +9,9 @@ const rule = {
   message: 'Invoiced note subject code shall be coded using UNCL4451',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931BrCl08(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931BrCl08(document: PeppolDocument): boolean {
   const passed = noteSubjectCodeIsUncl4451(document);
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931BrCl08 = schematronRule(rule, evaluateCenEn16931BrCl08);

package/src/schematron/cen/co/cen-en16931-br-co-03.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: 'CEN-EN16931-BR-CO-03',
@@ -10,7 +9,9 @@ const rule = {
   message: 'Value added tax point date (BT-7) and Value added tax point date code (BT-8) are mutually exclusive.',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931BrCo03(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931BrCo03(document: PeppolDocument): boolean {
   const passed = !document.taxPointDate || !document.invoicePeriod?.descriptionCode;
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931BrCo03 = schematronRule(rule, evaluateCenEn16931BrCo03);

package/src/schematron/cen/co/cen-en16931-br-co-04.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: 'CEN-EN16931-BR-CO-04',
@@ -10,9 +9,11 @@ const rule = {
   message: 'Each Invoice line (BG-25) shall be categorized with an Invoiced item VAT category code (BT-151).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931BrCo04(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931BrCo04(document: PeppolDocument): boolean {
   const passed = getLines(document).every(
     line => typeof line.item.classifiedTaxCategory?.id === 'string' && line.item.classifiedTaxCategory.taxSchemeId.id.toUpperCase() === 'VAT'
   );
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931BrCo04 = schematronRule(rule, evaluateCenEn16931BrCo04);

package/src/schematron/cen/co/cen-en16931-br-co-05.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: 'CEN-EN16931-BR-CO-05',
@@ -10,7 +9,9 @@ const rule = {
   message: 'Document level allowance reason code (BT-98) and Document level allowance reason (BT-97) shall indicate the same type of allowance.',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931BrCo05(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931BrCo05(document: PeppolDocument): boolean {
   void document;
-  return schematronResult(rule, true);
+  return true;
 }
+
+export const validateCenEn16931BrCo05 = schematronRule(rule, evaluateCenEn16931BrCo05);

package/src/schematron/cen/co/cen-en16931-br-co-06.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: 'CEN-EN16931-BR-CO-06',
@@ -10,7 +9,9 @@ const rule = {
   message: 'Document level charge reason code (BT-105) and Document level charge reason (BT-104) shall indicate the same type of charge.',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931BrCo06(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931BrCo06(document: PeppolDocument): boolean {
   void document;
-  return schematronResult(rule, true);
+  return true;
 }
+
+export const validateCenEn16931BrCo06 = schematronRule(rule, evaluateCenEn16931BrCo06);

package/src/schematron/cen/co/cen-en16931-br-co-07.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: 'CEN-EN16931-BR-CO-07',
@@ -10,7 +9,9 @@ const rule = {
   message: 'Invoice line allowance reason code (BT-140) and Invoice line allowance reason (BT-139) shall indicate the same type of allowance reason.',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931BrCo07(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931BrCo07(document: PeppolDocument): boolean {
   void document;
-  return schematronResult(rule, true);
+  return true;
 }
+
+export const validateCenEn16931BrCo07 = schematronRule(rule, evaluateCenEn16931BrCo07);

package/src/schematron/cen/co/cen-en16931-br-co-08.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: 'CEN-EN16931-BR-CO-08',
@@ -10,7 +9,9 @@ const rule = {
   message: 'Invoice line charge reason code (BT-145) and Invoice line charge reason (BT-144) shall indicate the same type of charge reason.',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931BrCo08(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931BrCo08(document: PeppolDocument): boolean {
   void document;
-  return schematronResult(rule, true);
+  return true;
 }
+
+export const validateCenEn16931BrCo08 = schematronRule(rule, evaluateCenEn16931BrCo08);

package/src/schematron/cen/co/cen-en16931-br-co-09.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 { allVatCompanyIdsHaveValidPrefix, schematronResult } from '#/schematron/helpers';
+import { allVatCompanyIdsHaveValidPrefix, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'CEN-EN16931-BR-CO-09',
@@ -11,7 +10,9 @@ const rule = {
     'The Seller VAT identifier (BT-31), the Seller tax representative VAT identifier (BT-63) and the Buyer VAT identifier (BT-48) shall have a prefix in accordance with ISO code ISO 3166-1 alpha-2 by which the country of issue may be identified. Nevertheless, Greece may use the prefix ‘EL’.',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931BrCo09(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931BrCo09(document: PeppolDocument): boolean {
   const passed = allVatCompanyIdsHaveValidPrefix(document);
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931BrCo09 = schematronRule(rule, evaluateCenEn16931BrCo09);

package/src/schematron/cen/co/cen-en16931-br-co-10.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 { amountsEqual, getLines, round2, schematronResult } from '#/schematron/helpers';
+import { amountsEqual, getLines, round2, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'CEN-EN16931-BR-CO-10',
@@ -10,10 +9,12 @@ const rule = {
   message: 'Sum of Invoice line net amount (BT-106) = Σ Invoice line net amount (BT-131).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931BrCo10(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931BrCo10(document: PeppolDocument): boolean {
   const passed = amountsEqual(
     round2(document.legalMonetaryTotal.lineExtensionAmount.value),
     round2(getLines(document).reduce((sum, line) => sum + line.lineExtensionAmount.value, 0))
   );
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931BrCo10 = schematronRule(rule, evaluateCenEn16931BrCo10);

package/src/schematron/cen/co/cen-en16931-br-co-11.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 { amountsEqual, round2, schematronResult } from '#/schematron/helpers';
+import { amountsEqual, round2, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'CEN-EN16931-BR-CO-11',
@@ -10,7 +9,7 @@ const rule = {
   message: 'Sum of allowances on document level (BT-107) = Σ Document level allowance amount (BT-92).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931BrCo11(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931BrCo11(document: PeppolDocument): boolean {
   const passed = (() => {
     const allowances = (document.allowanceCharges ?? []).filter(ac => !ac.chargeIndicator);
     if (!document.legalMonetaryTotal.allowanceTotalAmount) {
@@ -21,5 +20,7 @@ export function validateCenEn16931BrCo11(document: PeppolDocument): SchematronRu
       round2(allowances.reduce((sum, ac) => sum + (ac.amount?.value ?? 0), 0))
     );
   })();
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931BrCo11 = schematronRule(rule, evaluateCenEn16931BrCo11);

package/src/schematron/cen/co/cen-en16931-br-co-12.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 { amountsEqual, round2, schematronResult } from '#/schematron/helpers';
+import { amountsEqual, round2, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'CEN-EN16931-BR-CO-12',
@@ -10,7 +9,7 @@ const rule = {
   message: 'Sum of charges on document level (BT-108) = Σ Document level charge amount (BT-99).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931BrCo12(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931BrCo12(document: PeppolDocument): boolean {
   const passed = (() => {
     const charges = (document.allowanceCharges ?? []).filter(ac => ac.chargeIndicator);
     if (!document.legalMonetaryTotal.chargeTotalAmount) {
@@ -21,5 +20,7 @@ export function validateCenEn16931BrCo12(document: PeppolDocument): SchematronRu
       round2(charges.reduce((sum, ac) => sum + (ac.amount?.value ?? 0), 0))
     );
   })();
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931BrCo12 = schematronRule(rule, evaluateCenEn16931BrCo12);

package/src/schematron/cen/co/cen-en16931-br-co-13.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 { amountsEqual, round2, schematronResult } from '#/schematron/helpers';
+import { amountsEqual, round2, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'CEN-EN16931-BR-CO-13',
@@ -11,12 +10,14 @@ const rule = {
     'Invoice total amount without VAT (BT-109) = Σ Invoice line net amount (BT-131) - Sum of allowances on document level (BT-107) + Sum of charges on document level (BT-108).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931BrCo13(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931BrCo13(document: PeppolDocument): boolean {
   const passed = (() => {
     const total = document.legalMonetaryTotal;
     const allowance = total.allowanceTotalAmount?.value ?? 0;
     const charge = total.chargeTotalAmount?.value ?? 0;
     return amountsEqual(round2(total.taxExclusiveAmount.value), round2(total.lineExtensionAmount.value + charge - allowance));
   })();
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931BrCo13 = schematronRule(rule, evaluateCenEn16931BrCo13);

package/src/schematron/cen/co/cen-en16931-br-co-14.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 { amountsEqual, round2, schematronResult } from '#/schematron/helpers';
+import { amountsEqual, round2, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'CEN-EN16931-BR-CO-14',
@@ -10,11 +9,13 @@ const rule = {
   message: 'Invoice total VAT amount (BT-110) = Σ VAT category tax amount (BT-117).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931BrCo14(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931BrCo14(document: PeppolDocument): boolean {
   const passed = document.taxTotals.every(
     total =>
       (total.taxSubtotals?.length ?? 0) === 0 ||
       amountsEqual(round2(total.taxAmount.value), round2((total.taxSubtotals ?? []).reduce((sum, st) => sum + st.taxAmount.value, 0)))
   );
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931BrCo14 = schematronRule(rule, evaluateCenEn16931BrCo14);

package/src/schematron/cen/co/cen-en16931-br-co-15.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 { amountsEqual, round2, schematronResult } from '#/schematron/helpers';
+import { amountsEqual, round2, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'CEN-EN16931-BR-CO-15',
@@ -10,7 +9,7 @@ const rule = {
   message: 'Invoice total amount with VAT (BT-112) = Invoice total amount without VAT (BT-109) + Invoice total VAT amount (BT-110).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931BrCo15(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931BrCo15(document: PeppolDocument): boolean {
   const passed = (() => {
     const taxTotal = document.taxTotals.find(total => total.taxAmount.currencyId === document.documentCurrencyCode);
     if (!taxTotal) {
@@ -24,5 +23,7 @@ export function validateCenEn16931BrCo15(document: PeppolDocument): SchematronRu
       round2(document.legalMonetaryTotal.taxExclusiveAmount.value + taxTotal.taxAmount.value)
     );
   })();
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931BrCo15 = schematronRule(rule, evaluateCenEn16931BrCo15);

package/src/schematron/cen/co/cen-en16931-br-co-16.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 { amountsEqual, round2, schematronResult } from '#/schematron/helpers';
+import { amountsEqual, round2, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'CEN-EN16931-BR-CO-16',
@@ -10,12 +9,14 @@ const rule = {
   message: 'Amount due for payment (BT-115) = Invoice total amount with VAT (BT-112) -Paid amount (BT-113) +Rounding amount (BT-114).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931BrCo16(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931BrCo16(document: PeppolDocument): boolean {
   const passed = (() => {
     const total = document.legalMonetaryTotal;
     const prepaid = total.prepaidAmount?.value ?? 0;
     const rounding = total.payableRoundingAmount?.value ?? 0;
     return amountsEqual(round2(total.payableAmount.value - rounding), round2(total.taxInclusiveAmount.value - prepaid));
   })();
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931BrCo16 = schematronRule(rule, evaluateCenEn16931BrCo16);

package/src/schematron/cen/co/cen-en16931-br-co-17.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 { vatCategoryTaxAmountMatchesRate, schematronResult } from '#/schematron/helpers';
+import { schematronRule, vatCategoryTaxAmountMatchesRate } from '#/schematron/helpers';
 
 const rule = {
   id: 'CEN-EN16931-BR-CO-17',
@@ -10,7 +9,9 @@ const rule = {
   message: 'VAT category tax amount (BT-117) = VAT category taxable amount (BT-116) x (VAT category rate (BT-119) / 100), rounded to two decimals.',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931BrCo17(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931BrCo17(document: PeppolDocument): boolean {
   const passed = document.taxTotals.every(total => (total.taxSubtotals ?? []).every(st => vatCategoryTaxAmountMatchesRate(st)));
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931BrCo17 = schematronRule(rule, evaluateCenEn16931BrCo17);

package/src/schematron/cen/co/cen-en16931-br-co-18.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: 'CEN-EN16931-BR-CO-18',
@@ -10,7 +9,9 @@ const rule = {
   message: 'An Invoice shall at least have one VAT breakdown group (BG-23).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931BrCo18(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931BrCo18(document: PeppolDocument): boolean {
   const passed = document.taxTotals.some(total => (total.taxSubtotals?.length ?? 0) > 0);
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931BrCo18 = schematronRule(rule, evaluateCenEn16931BrCo18);

package/src/schematron/cen/co/cen-en16931-br-co-19.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 { everyPeriodHasDateOrDescriptionCode, schematronResult } from '#/schematron/helpers';
+import { everyPeriodHasDateOrDescriptionCode, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'CEN-EN16931-BR-CO-19',
@@ -11,7 +10,9 @@ const rule = {
     'If Invoicing period (BG-14) is used, the Invoicing period start date (BT-73) or the Invoicing period end date (BT-74) shall be filled, or both.',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931BrCo19(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931BrCo19(document: PeppolDocument): boolean {
   const passed = everyPeriodHasDateOrDescriptionCode(document);
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931BrCo19 = schematronRule(rule, evaluateCenEn16931BrCo19);

package/src/schematron/cen/co/cen-en16931-br-co-20.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 { everyPeriodHasDateOrDescriptionCode, schematronResult } from '#/schematron/helpers';
+import { everyPeriodHasDateOrDescriptionCode, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'CEN-EN16931-BR-CO-20',
@@ -11,7 +10,9 @@ const rule = {
     'If Invoice line period (BG-26) is used, the Invoice line period start date (BT-134) or the Invoice line period end date (BT-135) shall be filled, or both.',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931BrCo20(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931BrCo20(document: PeppolDocument): boolean {
   const passed = everyPeriodHasDateOrDescriptionCode(document);
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931BrCo20 = schematronRule(rule, evaluateCenEn16931BrCo20);

package/src/schematron/cen/co/cen-en16931-br-co-21.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: 'CEN-EN16931-BR-CO-21',
@@ -11,9 +10,11 @@ const rule = {
     'Each Document level allowance (BG-20) shall contain a Document level allowance reason (BT-97) or a Document level allowance reason code (BT-98), or both.',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931BrCo21(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931BrCo21(document: PeppolDocument): boolean {
   const passed = (document.allowanceCharges ?? [])
     .filter(ac => !ac.chargeIndicator)
     .every(ac => typeof ac.allowanceChargeReason === 'string' || typeof ac.allowanceChargeReasonCode === 'string');
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931BrCo21 = schematronRule(rule, evaluateCenEn16931BrCo21);

package/src/schematron/cen/co/cen-en16931-br-co-22.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: 'CEN-EN16931-BR-CO-22',
@@ -11,9 +10,11 @@ const rule = {
     'Each Document level charge (BG-21) shall contain a Document level charge reason (BT-104) or a Document level charge reason code (BT-105), or both.',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931BrCo22(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931BrCo22(document: PeppolDocument): boolean {
   const passed = (document.allowanceCharges ?? [])
     .filter(ac => ac.chargeIndicator)
     .every(ac => typeof ac.allowanceChargeReason === 'string' || typeof ac.allowanceChargeReasonCode === 'string');
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931BrCo22 = schematronRule(rule, evaluateCenEn16931BrCo22);

package/src/schematron/cen/co/cen-en16931-br-co-23.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: 'CEN-EN16931-BR-CO-23',
@@ -11,11 +10,13 @@ const rule = {
     'Each Invoice line allowance (BG-27) shall contain an Invoice line allowance reason (BT-139) or an Invoice line allowance reason code (BT-140), or both.',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931BrCo23(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931BrCo23(document: PeppolDocument): boolean {
   const passed = getLines(document).every(line =>
     (line.allowanceCharges ?? [])
       .filter(ac => !ac.chargeIndicator)
       .every(ac => typeof ac.allowanceChargeReason === 'string' || typeof ac.allowanceChargeReasonCode === 'string')
   );
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931BrCo23 = schematronRule(rule, evaluateCenEn16931BrCo23);