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

package/src/schematron/cen/cen-en16931-br-32.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-32',
@@ -10,9 +9,11 @@ const rule = {
   message: 'Each Document level allowance (BG-20) shall have a Document level allowance VAT category code (BT-95).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br32(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br32(document: PeppolDocument): boolean {
   const passed = (document.allowanceCharges ?? [])
     .filter(ac => !ac.chargeIndicator)
     .every(ac => typeof ac.taxCategory?.id === 'string' && ac.taxCategory.taxSchemeId.id.toUpperCase() === 'VAT');
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931Br32 = schematronRule(rule, evaluateCenEn16931Br32);

package/src/schematron/cen/cen-en16931-br-33.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-33',
@@ -11,9 +10,11 @@ const rule = {
     'Each Document level allowance (BG-20) shall have a Document level allowance reason (BT-97) or a Document level allowance reason code (BT-98).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br33(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br33(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 validateCenEn16931Br33 = schematronRule(rule, evaluateCenEn16931Br33);

package/src/schematron/cen/cen-en16931-br-36.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-36',
@@ -10,7 +9,9 @@ const rule = {
   message: 'Each Document level charge (BG-21) shall have a Document level charge amount (BT-99).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br36(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br36(document: PeppolDocument): boolean {
   const passed = (document.allowanceCharges ?? []).filter(ac => ac.chargeIndicator).every(ac => typeof ac.amount === 'object' && ac.amount !== null);
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931Br36 = schematronRule(rule, evaluateCenEn16931Br36);

package/src/schematron/cen/cen-en16931-br-37.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-37',
@@ -10,9 +9,11 @@ const rule = {
   message: 'Each Document level charge (BG-21) shall have a Document level charge VAT category code (BT-102).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br37(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br37(document: PeppolDocument): boolean {
   const passed = (document.allowanceCharges ?? [])
     .filter(ac => ac.chargeIndicator)
     .every(ac => typeof ac.taxCategory?.id === 'string' && ac.taxCategory.taxSchemeId.id.toUpperCase() === 'VAT');
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931Br37 = schematronRule(rule, evaluateCenEn16931Br37);

package/src/schematron/cen/cen-en16931-br-38.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-38',
@@ -10,9 +9,11 @@ const rule = {
   message: 'Each Document level charge (BG-21) shall have a Document level charge reason (BT-104) or a Document level charge reason code (BT-105).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br38(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br38(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 validateCenEn16931Br38 = schematronRule(rule, evaluateCenEn16931Br38);

package/src/schematron/cen/cen-en16931-br-41.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-41',
@@ -10,9 +9,11 @@ const rule = {
   message: 'Each Invoice line allowance (BG-27) shall have an Invoice line allowance amount (BT-136).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br41(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br41(document: PeppolDocument): boolean {
   const passed = getLines(document).every(line =>
     (line.allowanceCharges ?? []).filter(ac => !ac.chargeIndicator).every(ac => typeof ac.amount === 'object' && ac.amount !== null)
   );
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931Br41 = schematronRule(rule, evaluateCenEn16931Br41);

package/src/schematron/cen/cen-en16931-br-42.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-42',
@@ -11,11 +10,13 @@ const rule = {
     'Each Invoice line allowance (BG-27) shall have an Invoice line allowance reason (BT-139) or an Invoice line allowance reason code (BT-140).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br42(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br42(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 validateCenEn16931Br42 = schematronRule(rule, evaluateCenEn16931Br42);

package/src/schematron/cen/cen-en16931-br-43.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-43',
@@ -10,9 +9,11 @@ const rule = {
   message: 'Each Invoice line charge (BG-28) shall have an Invoice line charge amount (BT-141).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br43(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br43(document: PeppolDocument): boolean {
   const passed = getLines(document).every(line =>
     (line.allowanceCharges ?? []).filter(ac => ac.chargeIndicator).every(ac => typeof ac.amount === 'object' && ac.amount !== null)
   );
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931Br43 = schematronRule(rule, evaluateCenEn16931Br43);

package/src/schematron/cen/cen-en16931-br-44.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-44',
@@ -10,11 +9,13 @@ const rule = {
   message: 'Each Invoice line charge shall have an Invoice line charge reason or an invoice line allowance reason code.',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br44(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br44(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 validateCenEn16931Br44 = schematronRule(rule, evaluateCenEn16931Br44);

package/src/schematron/cen/cen-en16931-br-45.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-45',
@@ -10,9 +9,11 @@ const rule = {
   message: 'Each VAT breakdown (BG-23) shall have a VAT category taxable amount (BT-116).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br45(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br45(document: PeppolDocument): boolean {
   const passed = document.taxTotals.every(total =>
     (total.taxSubtotals ?? []).every(st => typeof st.taxableAmount === 'object' && st.taxableAmount !== null)
   );
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931Br45 = schematronRule(rule, evaluateCenEn16931Br45);

package/src/schematron/cen/cen-en16931-br-46.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-46',
@@ -10,7 +9,9 @@ const rule = {
   message: 'Each VAT breakdown (BG-23) shall have a VAT category tax amount (BT-117).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br46(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br46(document: PeppolDocument): boolean {
   const passed = document.taxTotals.every(total => (total.taxSubtotals ?? []).every(st => typeof st.taxAmount === 'object' && st.taxAmount !== null));
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931Br46 = schematronRule(rule, evaluateCenEn16931Br46);

package/src/schematron/cen/cen-en16931-br-47.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-47',
@@ -10,9 +9,11 @@ const rule = {
   message: 'Each VAT breakdown (BG-23) shall be defined through a VAT category code (BT-118).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br47(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br47(document: PeppolDocument): boolean {
   const passed = document.taxTotals.every(total =>
     (total.taxSubtotals ?? []).every(st => typeof st.taxCategory?.id === 'string' && st.taxCategory.taxSchemeId.id.toUpperCase() === 'VAT')
   );
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931Br47 = schematronRule(rule, evaluateCenEn16931Br47);

package/src/schematron/cen/cen-en16931-br-48.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-48',
@@ -10,9 +9,11 @@ const rule = {
   message: 'Each VAT breakdown (BG-23) shall have a VAT category rate (BT-119), except if the Invoice is not subject to VAT.',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br48(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br48(document: PeppolDocument): boolean {
   const passed = document.taxTotals.every(total =>
     (total.taxSubtotals ?? []).every(st => typeof st.taxCategory.percent === 'number' || st.taxCategory.id === 'O')
   );
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931Br48 = schematronRule(rule, evaluateCenEn16931Br48);

package/src/schematron/cen/cen-en16931-br-49.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-49',
@@ -10,7 +9,9 @@ const rule = {
   message: 'A Payment instruction (BG-16) shall specify the Payment means type code (BT-81).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br49(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br49(document: PeppolDocument): boolean {
   const passed = (document.paymentMeans ?? []).every(pm => typeof pm.paymentMeansCode?.code === 'string' && pm.paymentMeansCode.code.trim() !== '');
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931Br49 = schematronRule(rule, evaluateCenEn16931Br49);

package/src/schematron/cen/cen-en16931-br-50.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-50',
@@ -10,11 +9,13 @@ const rule = {
   message: 'A Payment account identifier (BT-84) shall be present if Credit transfer (BG-17) information is provided in the Invoice.',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br50(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br50(document: PeppolDocument): boolean {
   const passed = (document.paymentMeans ?? []).every(
     pm =>
       (pm.paymentMeansCode?.code !== '30' && pm.paymentMeansCode?.code !== '58') ||
       (typeof pm.payeeFinancialAccount?.id === 'string' && pm.payeeFinancialAccount.id.trim() !== '')
   );
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931Br50 = schematronRule(rule, evaluateCenEn16931Br50);

package/src/schematron/cen/cen-en16931-br-51.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-51',
@@ -11,7 +10,9 @@ const rule = {
     'In accordance with card payments security standards an invoice should never include a full card primary account number (BT-87). At the moment PCI Security Standards Council has defined that the first 6 digits and last 4 digits are the maximum number of digits to be shown.',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br51(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br51(document: PeppolDocument): boolean {
   const passed = (document.paymentMeans ?? []).every(pm => !pm.cardAccount || pm.cardAccount.primaryAccountNumberId.trim().length <= 10);
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931Br51 = schematronRule(rule, evaluateCenEn16931Br51);

package/src/schematron/cen/cen-en16931-br-52.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-52',
@@ -10,7 +9,9 @@ const rule = {
   message: 'Each Additional supporting document (BG-24) shall contain a Supporting document reference (BT-122).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br52(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br52(document: PeppolDocument): boolean {
   const passed = (document.additionalDocumentReferences ?? []).every(ref => typeof ref.id?.id === 'string' && ref.id.id.trim() !== '');
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931Br52 = schematronRule(rule, evaluateCenEn16931Br52);

package/src/schematron/cen/cen-en16931-br-53.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-53',
@@ -11,7 +10,9 @@ const rule = {
     'If the VAT accounting currency code (BT-6) is present, then the Invoice total VAT amount in accounting currency (BT-111) shall be provided.',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br53(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br53(document: PeppolDocument): boolean {
   const passed = !document.taxCurrencyCode || document.taxTotals.some(total => total.taxAmount.currencyId === document.taxCurrencyCode);
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931Br53 = schematronRule(rule, evaluateCenEn16931Br53);

package/src/schematron/cen/cen-en16931-br-54.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-54',
@@ -10,11 +9,13 @@ const rule = {
   message: 'Each Item attribute (BG-32) shall contain an Item attribute name (BT-160) and an Item attribute value (BT-161).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br54(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br54(document: PeppolDocument): boolean {
   const passed = getLines(document).every(line =>
     (line.item.additionalItemProperties ?? []).every(
       prop => typeof prop.name === 'string' && prop.name.trim() !== '' && typeof prop.value === 'string' && prop.value.trim() !== ''
     )
   );
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931Br54 = schematronRule(rule, evaluateCenEn16931Br54);

package/src/schematron/cen/cen-en16931-br-55.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-55',
@@ -10,9 +9,11 @@ const rule = {
   message: 'Each Preceding Invoice reference (BG-3) shall contain a Preceding Invoice reference (BT-25).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br55(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br55(document: PeppolDocument): boolean {
   const passed = (document.billingReferences ?? []).every(
     ref => typeof ref.invoiceDocumentReference.id === 'string' && ref.invoiceDocumentReference.id.trim() !== ''
   );
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931Br55 = schematronRule(rule, evaluateCenEn16931Br55);

package/src/schematron/cen/cen-en16931-br-56.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 { hasTaxRepresentativeVatCompanyId, schematronResult } from '#/schematron/helpers';
+import { hasTaxRepresentativeVatCompanyId, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'CEN-EN16931-BR-56',
@@ -10,7 +9,9 @@ const rule = {
   message: 'Each Seller tax representative party (BG-11) shall have a Seller tax representative VAT identifier (BT-63).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br56(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br56(document: PeppolDocument): boolean {
   const passed = !document.taxRepresentativeParty || hasTaxRepresentativeVatCompanyId(document);
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931Br56 = schematronRule(rule, evaluateCenEn16931Br56);

package/src/schematron/cen/cen-en16931-br-57.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-57',
@@ -10,9 +9,11 @@ const rule = {
   message: 'Each Deliver to address (BG-15) shall contain a Deliver to country code (BT-80).',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br57(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br57(document: PeppolDocument): boolean {
   const passed =
     typeof document.delivery?.deliveryLocation?.address?.countryCode.identificationCode === 'string' &&
     document.delivery.deliveryLocation.address.countryCode.identificationCode.trim() !== '';
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931Br57 = schematronRule(rule, evaluateCenEn16931Br57);

package/src/schematron/cen/cen-en16931-br-61.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-61',
@@ -11,11 +10,13 @@ const rule = {
     'If the Payment means type code (BT-81) means SEPA credit transfer, Local credit transfer or Non-SEPA international credit transfer, the Payment account identifier (BT-84) shall be present.',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br61(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br61(document: PeppolDocument): boolean {
   const passed = (document.paymentMeans ?? []).every(
     pm =>
       (pm.paymentMeansCode?.code !== '30' && pm.paymentMeansCode?.code !== '58') ||
       (typeof pm.payeeFinancialAccount?.id === 'string' && pm.payeeFinancialAccount.id.trim() !== '')
   );
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931Br61 = schematronRule(rule, evaluateCenEn16931Br61);

package/src/schematron/cen/cen-en16931-br-62.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-62',
@@ -10,8 +9,10 @@ const rule = {
   message: 'The Seller electronic address (BT-34) shall have a Scheme identifier.',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br62(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br62(document: PeppolDocument): boolean {
   const passed =
     typeof document.accountingSupplierParty.endpointId?.schemeId === 'string' && document.accountingSupplierParty.endpointId.schemeId.trim() !== '';
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931Br62 = schematronRule(rule, evaluateCenEn16931Br62);

package/src/schematron/cen/cen-en16931-br-63.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-63',
@@ -10,8 +9,10 @@ const rule = {
   message: 'The Buyer electronic address (BT-49) shall have a Scheme identifier.',
 } as const satisfies SchematronRule;
 
-export function validateCenEn16931Br63(document: PeppolDocument): SchematronRuleResult {
+function evaluateCenEn16931Br63(document: PeppolDocument): boolean {
   const passed =
     typeof document.accountingCustomerParty.endpointId?.schemeId === 'string' && document.accountingCustomerParty.endpointId.schemeId.trim() !== '';
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateCenEn16931Br63 = schematronRule(rule, evaluateCenEn16931Br63);