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

package/src/schematron/peppol/f/peppol-en16931-f001.ts

@@ -1,8 +1,10 @@
-import type { PeppolDocument } from '#/document';
+import { Predicate, Schema } from 'effect';
+
+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 { PeppolIsoDateString } from '#/schemas/peppol-iso-date-string';
+import { getLines, schematronRule } from '#/schematron/helpers';
 
 const rule = { id: 'PEPPOL-EN16931-F001', level: 'fatal', message: 'A date MUST be formatted YYYY-MM-DD.' } as const satisfies SchematronRule;
 
@@ -10,16 +12,21 @@ const DATE_REGEX = /^\d{4}-\d{2}-\d{2}$/;
 
 const isValidDate = (value: string | undefined): boolean => value === undefined || (DATE_REGEX.test(value) && !Number.isNaN(Date.parse(value)));
 
-export function validatePeppolEn16931F001(document: PeppolDocument): SchematronRuleResult {
-  const dates: Array<string | undefined> = [document.issueDate];
-  if (document.dueDate) dates.push(document.dueDate);
-  if (document.taxPointDate) dates.push(document.taxPointDate);
-  if (document.invoicePeriod?.startDate) dates.push(document.invoicePeriod.startDate);
-  if (document.invoicePeriod?.endDate) dates.push(document.invoicePeriod.endDate);
-  if (document.delivery?.actualDeliveryDate) dates.push(document.delivery.actualDeliveryDate);
+const encodeDateSync = Schema.encodeSync(Schema.Union([PeppolIsoDateString, Schema.String]));
+const isDate = Schema.is(PeppolIsoDateString);
+
+function evaluatePeppolEn16931F001(document: PeppolDocument): boolean {
+  const dates: Array<string | undefined> = [encodeDateSync(document.issueDate)];
+  if (Predicate.hasProperty(document, 'dueDate') && isDate(document.dueDate)) dates.push(encodeDateSync(document.dueDate));
+  if (document.taxPointDate) dates.push(encodeDateSync(document.taxPointDate));
+  if (document.invoicePeriod?.startDate) dates.push(encodeDateSync(document.invoicePeriod.startDate));
+  if (document.invoicePeriod?.endDate) dates.push(encodeDateSync(document.invoicePeriod.endDate));
+  if (document.delivery?.actualDeliveryDate) dates.push(encodeDateSync(document.delivery.actualDeliveryDate));
   for (const line of getLines(document)) {
-    if (line.invoicePeriod?.startDate) dates.push(line.invoicePeriod.startDate);
-    if (line.invoicePeriod?.endDate) dates.push(line.invoicePeriod.endDate);
+    if (line.invoicePeriod?.startDate) dates.push(encodeDateSync(line.invoicePeriod.startDate));
+    if (line.invoicePeriod?.endDate) dates.push(encodeDateSync(line.invoicePeriod.endDate));
   }
-  return schematronResult(rule, dates.every(isValidDate));
+  return dates.every(isValidDate);
 }
+
+export const validatePeppolEn16931F001 = schematronRule(rule, evaluatePeppolEn16931F001);

package/src/schematron/peppol/p/peppol-en16931-p0100.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-P0100',
@@ -39,14 +38,16 @@ const PROFILE_01_INVOICE_TYPE_CODES = new Set([
   '877',
 ]);
 
-export function validatePeppolEn16931P0100(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931P0100(document: PeppolDocument): boolean {
   const invoiceTypeCode = 'invoiceTypeCode' in document ? document.invoiceTypeCode : undefined;
   if (invoiceTypeCode === undefined) {
-    return schematronResult(rule, true);
+    return true;
   }
   const profile = getProfile(document);
   if (profile === 'Unknown' || profile !== '01') {
-    return schematronResult(rule, true);
+    return true;
   }
-  return schematronResult(rule, PROFILE_01_INVOICE_TYPE_CODES.has(invoiceTypeCode));
+  return PROFILE_01_INVOICE_TYPE_CODES.has(invoiceTypeCode);
 }
+
+export const validatePeppolEn16931P0100 = schematronRule(rule, evaluatePeppolEn16931P0100);

package/src/schematron/peppol/p/peppol-en16931-p0101.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-P0101',
@@ -12,14 +11,16 @@ const rule = {
 
 const PROFILE_01_CREDIT_NOTE_TYPE_CODES = new Set(['381', '396', '81', '83', '532']);
 
-export function validatePeppolEn16931P0101(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931P0101(document: PeppolDocument): boolean {
   const creditNoteTypeCode = 'creditNoteTypeCode' in document ? document.creditNoteTypeCode : undefined;
   if (creditNoteTypeCode === undefined) {
-    return schematronResult(rule, true);
+    return true;
   }
   const profile = getProfile(document);
   if (profile === 'Unknown' || profile !== '01') {
-    return schematronResult(rule, true);
+    return true;
   }
-  return schematronResult(rule, PROFILE_01_CREDIT_NOTE_TYPE_CODES.has(creditNoteTypeCode));
+  return PROFILE_01_CREDIT_NOTE_TYPE_CODES.has(creditNoteTypeCode);
 }
+
+export const validatePeppolEn16931P0101 = schematronRule(rule, evaluatePeppolEn16931P0101);

package/src/schematron/peppol/p/peppol-en16931-p0104.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-P0104',
@@ -10,8 +9,10 @@ const rule = {
   message: 'Tax Category G MUST be used when exemption reason code is VATEX-EU-G',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931P0104(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931P0104(document: PeppolDocument): boolean {
   const taxCategories = document.taxTotals.flatMap(total => (total.taxSubtotals ?? []).map(subtotal => subtotal.taxCategory));
   const passed = taxCategories.every(category => category.taxExemptionReasonCode?.toUpperCase() !== 'VATEX-EU-G' || category.id === 'G');
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931P0104 = schematronRule(rule, evaluatePeppolEn16931P0104);

package/src/schematron/peppol/p/peppol-en16931-p0105.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-P0105',
@@ -10,8 +9,10 @@ const rule = {
   message: 'Tax Category O MUST be used when exemption reason code is VATEX-EU-O',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931P0105(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931P0105(document: PeppolDocument): boolean {
   const taxCategories = document.taxTotals.flatMap(total => (total.taxSubtotals ?? []).map(subtotal => subtotal.taxCategory));
   const passed = taxCategories.every(category => category.taxExemptionReasonCode?.toUpperCase() !== 'VATEX-EU-O' || category.id === 'O');
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931P0105 = schematronRule(rule, evaluatePeppolEn16931P0105);

package/src/schematron/peppol/p/peppol-en16931-p0106.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-P0106',
@@ -10,8 +9,10 @@ const rule = {
   message: 'Tax Category K MUST be used when exemption reason code is VATEX-EU-IC',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931P0106(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931P0106(document: PeppolDocument): boolean {
   const taxCategories = document.taxTotals.flatMap(total => (total.taxSubtotals ?? []).map(subtotal => subtotal.taxCategory));
   const passed = taxCategories.every(category => category.taxExemptionReasonCode?.toUpperCase() !== 'VATEX-EU-IC' || category.id === 'K');
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931P0106 = schematronRule(rule, evaluatePeppolEn16931P0106);

package/src/schematron/peppol/p/peppol-en16931-p0107.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-P0107',
@@ -10,8 +9,10 @@ const rule = {
   message: 'Tax Category AE MUST be used when exemption reason code is VATEX-EU-AE',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931P0107(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931P0107(document: PeppolDocument): boolean {
   const taxCategories = document.taxTotals.flatMap(total => (total.taxSubtotals ?? []).map(subtotal => subtotal.taxCategory));
   const passed = taxCategories.every(category => category.taxExemptionReasonCode?.toUpperCase() !== 'VATEX-EU-AE' || category.id === 'AE');
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931P0107 = schematronRule(rule, evaluatePeppolEn16931P0107);

package/src/schematron/peppol/p/peppol-en16931-p0108.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-P0108',
@@ -10,8 +9,10 @@ const rule = {
   message: 'Tax Category E MUST be used when exemption reason code is VATEX-EU-D',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931P0108(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931P0108(document: PeppolDocument): boolean {
   const taxCategories = document.taxTotals.flatMap(total => (total.taxSubtotals ?? []).map(subtotal => subtotal.taxCategory));
   const passed = taxCategories.every(category => category.taxExemptionReasonCode?.toUpperCase() !== 'VATEX-EU-D' || category.id === 'E');
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931P0108 = schematronRule(rule, evaluatePeppolEn16931P0108);

package/src/schematron/peppol/p/peppol-en16931-p0109.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-P0109',
@@ -10,8 +9,10 @@ const rule = {
   message: 'Tax Category E MUST be used when exemption reason code is VATEX-EU-F',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931P0109(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931P0109(document: PeppolDocument): boolean {
   const taxCategories = document.taxTotals.flatMap(total => (total.taxSubtotals ?? []).map(subtotal => subtotal.taxCategory));
   const passed = taxCategories.every(category => category.taxExemptionReasonCode?.toUpperCase() !== 'VATEX-EU-F' || category.id === 'E');
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931P0109 = schematronRule(rule, evaluatePeppolEn16931P0109);

package/src/schematron/peppol/p/peppol-en16931-p0110.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-P0110',
@@ -10,8 +9,10 @@ const rule = {
   message: 'Tax Category E MUST be used when exemption reason code is VATEX-EU-I',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931P0110(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931P0110(document: PeppolDocument): boolean {
   const taxCategories = document.taxTotals.flatMap(total => (total.taxSubtotals ?? []).map(subtotal => subtotal.taxCategory));
   const passed = taxCategories.every(category => category.taxExemptionReasonCode?.toUpperCase() !== 'VATEX-EU-I' || category.id === 'E');
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931P0110 = schematronRule(rule, evaluatePeppolEn16931P0110);

package/src/schematron/peppol/p/peppol-en16931-p0111.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-P0111',
@@ -10,8 +9,10 @@ const rule = {
   message: 'Tax Category E MUST be used when exemption reason code is VATEX-EU-J',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931P0111(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931P0111(document: PeppolDocument): boolean {
   const taxCategories = document.taxTotals.flatMap(total => (total.taxSubtotals ?? []).map(subtotal => subtotal.taxCategory));
   const passed = taxCategories.every(category => category.taxExemptionReasonCode?.toUpperCase() !== 'VATEX-EU-J' || category.id === 'E');
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931P0111 = schematronRule(rule, evaluatePeppolEn16931P0111);

package/src/schematron/peppol/p/peppol-en16931-p0112.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 { isCustomerGermany, isSupplierGermany, schematronResult } from '#/schematron/helpers';
+import { isCustomerGermany, isSupplierGermany, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-EN16931-P0112',
@@ -12,12 +11,14 @@ const rule = {
 
 const GERMAN_ONLY_CODES = new Set(['326', '384']);
 
-export function validatePeppolEn16931P0112(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931P0112(document: PeppolDocument): boolean {
   const invoiceTypeCode = 'invoiceTypeCode' in document ? document.invoiceTypeCode : undefined;
   const creditNoteTypeCode = 'creditNoteTypeCode' in document ? document.creditNoteTypeCode : undefined;
   const code = invoiceTypeCode ?? creditNoteTypeCode;
   if (!code || !GERMAN_ONLY_CODES.has(code)) {
-    return schematronResult(rule, true);
+    return true;
   }
-  return schematronResult(rule, isSupplierGermany(document) && isCustomerGermany(document));
+  return isSupplierGermany(document) && isCustomerGermany(document);
 }
+
+export const validatePeppolEn16931P0112 = schematronRule(rule, evaluatePeppolEn16931P0112);

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

@@ -1,14 +1,12 @@
-import type { PeppolDocument } from '#/document';
-import type { SchematronRuleResult } from '#/schematron/types';
-
-const RULE_ID = 'PEPPOL-EN16931-R001';
-const RULE_LEVEL = 'fatal';
-const RULE_MESSAGE = 'Business process MUST be provided.';
-
-/**
- * @description Validates the PEPPOL-EN16931-R001 rule: the document MUST contain a business process identifier (`cbc:ProfileID`).
- */
-export function validatePeppolEn16931R001(document: PeppolDocument): SchematronRuleResult {
-  const passed = typeof document.profileId === 'string' && document.profileId.trim() !== '';
-  return { id: RULE_ID, level: RULE_LEVEL, message: RULE_MESSAGE, passed };
+import type { PeppolDocument } from '#/schemas/peppol-document-schema';
+import type { SchematronRule } from '#/schematron/helpers';
+
+import { schematronRule } from '#/schematron/helpers';
+
+const rule = { id: 'PEPPOL-EN16931-R001', level: 'fatal', message: 'Business process MUST be provided.' } as const satisfies SchematronRule;
+
+function evaluatePeppolEn16931R001(document: PeppolDocument): boolean {
+  return typeof document.profileId === 'string' && document.profileId.trim() !== '';
 }
+
+export const validatePeppolEn16931R001 = schematronRule(rule, evaluatePeppolEn16931R001);

package/src/schematron/peppol/r/peppol-en16931-r002.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-R002',
@@ -10,7 +9,9 @@ const rule = {
   message: 'No more than one note is allowed on document level, unless both the buyer and seller are German organizations.',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931R002(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931R002(document: PeppolDocument): boolean {
   const noteCount = typeof document.note === 'string' ? 1 : 0;
-  return schematronResult(rule, noteCount <= 1);
+  return noteCount <= 1;
 }
+
+export const validatePeppolEn16931R002 = schematronRule(rule, evaluatePeppolEn16931R002);

package/src/schematron/peppol/r/peppol-en16931-r003.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-R003',
@@ -10,7 +9,9 @@ const rule = {
   message: 'A buyer reference or purchase order reference MUST be provided.',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931R003(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931R003(document: PeppolDocument): boolean {
   const passed = typeof document.buyerReference === 'string' && document.buyerReference.trim() !== '' ? true : Boolean(document.orderReference?.id);
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931R003 = schematronRule(rule, evaluatePeppolEn16931R003);

package/src/schematron/peppol/r/peppol-en16931-r004.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-R004',
@@ -12,7 +11,9 @@ const rule = {
 
 const CUSTOMIZATION_ID_PREFIX = 'urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0';
 
-export function validatePeppolEn16931R004(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931R004(document: PeppolDocument): boolean {
   const customizationId = typeof document.customizationId === 'string' ? document.customizationId.trim() : '';
-  return schematronResult(rule, customizationId.startsWith(CUSTOMIZATION_ID_PREFIX));
+  return customizationId.startsWith(CUSTOMIZATION_ID_PREFIX);
 }
+
+export const validatePeppolEn16931R004 = schematronRule(rule, evaluatePeppolEn16931R004);

package/src/schematron/peppol/r/peppol-en16931-r005.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-R005',
@@ -10,9 +9,11 @@ const rule = {
   message: 'VAT accounting currency code MUST be different from invoice currency code when provided.',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931R005(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931R005(document: PeppolDocument): boolean {
   if (!document.taxCurrencyCode) {
-    return schematronResult(rule, true);
+    return true;
   }
-  return schematronResult(rule, document.taxCurrencyCode !== document.documentCurrencyCode);
+  return document.taxCurrencyCode !== document.documentCurrencyCode;
 }
+
+export const validatePeppolEn16931R005 = schematronRule(rule, evaluatePeppolEn16931R005);

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);