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

package/src/schematron/de/de-r-009.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 { isGermanSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DE-R-009',
@@ -10,10 +9,12 @@ const rule = {
   message: 'The element "Buyer post code" (BT-53) shall be provided.',
 } as const satisfies SchematronRule;
 
-export function validateDeR009(document: PeppolDocument): SchematronRuleResult {
-  if (!isSupplierGermany(document) || !isCustomerGermany(document)) {
-    return schematronResult(rule, true);
+function evaluateDeR009(document: PeppolDocument): boolean {
+  if (!isGermanSupplierAndCustomer(document)) {
+    return true;
   }
   const postalZone = document.accountingCustomerParty.postalAddress.postalZone;
-  return schematronResult(rule, typeof postalZone === 'string' && postalZone.trim() !== '');
+  return typeof postalZone === 'string' && postalZone.trim() !== '';
 }
+
+export const validateDeR009 = schematronRule(rule, evaluateDeR009);

package/src/schematron/de/de-r-010.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 { isGermanSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DE-R-010',
@@ -10,14 +9,16 @@ const rule = {
   message: 'The element "Deliver to city" (BT-77) shall be provided if the group "DELIVER TO ADDRESS" (BG-15) is delivered.',
 } as const satisfies SchematronRule;
 
-export function validateDeR010(document: PeppolDocument): SchematronRuleResult {
-  if (!isSupplierGermany(document) || !isCustomerGermany(document)) {
-    return schematronResult(rule, true);
+function evaluateDeR010(document: PeppolDocument): boolean {
+  if (!isGermanSupplierAndCustomer(document)) {
+    return true;
   }
   const address = document.delivery?.deliveryLocation?.address;
   if (!address) {
-    return schematronResult(rule, true);
+    return true;
   }
   const cityName = address.cityName;
-  return schematronResult(rule, typeof cityName === 'string' && cityName.trim() !== '');
+  return typeof cityName === 'string' && cityName.trim() !== '';
 }
+
+export const validateDeR010 = schematronRule(rule, evaluateDeR010);

package/src/schematron/de/de-r-011.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 { isGermanSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DE-R-011',
@@ -10,14 +9,16 @@ const rule = {
   message: 'The element "Deliver to post code" (BT-78) shall be provided if the group "DELIVER TO ADDRESS" (BG-15) is delivered.',
 } as const satisfies SchematronRule;
 
-export function validateDeR011(document: PeppolDocument): SchematronRuleResult {
-  if (!isSupplierGermany(document) || !isCustomerGermany(document)) {
-    return schematronResult(rule, true);
+function evaluateDeR011(document: PeppolDocument): boolean {
+  if (!isGermanSupplierAndCustomer(document)) {
+    return true;
   }
   const address = document.delivery?.deliveryLocation?.address;
   if (!address) {
-    return schematronResult(rule, true);
+    return true;
   }
   const postalZone = address.postalZone;
-  return schematronResult(rule, typeof postalZone === 'string' && postalZone.trim() !== '');
+  return typeof postalZone === 'string' && postalZone.trim() !== '';
 }
+
+export const validateDeR011 = schematronRule(rule, evaluateDeR011);

package/src/schematron/de/de-r-014.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 { isGermanSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DE-R-014',
@@ -10,12 +9,14 @@ const rule = {
   message: 'The element "VAT category rate" (BT-119) shall be provided.',
 } as const satisfies SchematronRule;
 
-export function validateDeR014(document: PeppolDocument): SchematronRuleResult {
-  if (!isSupplierGermany(document) || !isCustomerGermany(document)) {
-    return schematronResult(rule, true);
+function evaluateDeR014(document: PeppolDocument): boolean {
+  if (!isGermanSupplierAndCustomer(document)) {
+    return true;
   }
   const passed = document.taxTotals.every(total =>
     (total.taxSubtotals ?? []).every(subtotal => typeof subtotal.taxCategory.percent === 'number' && subtotal.taxCategory.percent > 0)
   );
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateDeR014 = schematronRule(rule, evaluateDeR014);

package/src/schematron/de/de-r-015.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 { isGermanSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DE-R-015',
@@ -10,10 +9,12 @@ const rule = {
   message: 'The element "Buyer reference" (BT-10) shall be provided.',
 } as const satisfies SchematronRule;
 
-export function validateDeR015(document: PeppolDocument): SchematronRuleResult {
-  if (!isSupplierGermany(document) || !isCustomerGermany(document)) {
-    return schematronResult(rule, true);
+function evaluateDeR015(document: PeppolDocument): boolean {
+  if (!isGermanSupplierAndCustomer(document)) {
+    return true;
   }
   const buyerReference = document.buyerReference;
-  return schematronResult(rule, typeof buyerReference === 'string' && buyerReference.trim() !== '');
+  return typeof buyerReference === 'string' && buyerReference.trim() !== '';
 }
+
+export const validateDeR015 = schematronRule(rule, evaluateDeR015);

package/src/schematron/de/de-r-016.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, getLines, isCustomerGermany, isSupplierGermany, schematronResult } from '#/schematron/helpers';
+import { getAllAllowanceCharges, getLines, isGermanSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DE-R-016',
@@ -13,9 +12,9 @@ const rule = {
 
 const SUPPORTED_VAT_CODES = new Set(['S', 'Z', 'E', 'AE', 'K', 'G', 'L', 'M']);
 
-export function validateDeR016(document: PeppolDocument): SchematronRuleResult {
-  if (!isSupplierGermany(document) || !isCustomerGermany(document)) {
-    return schematronResult(rule, true);
+function evaluateDeR016(document: PeppolDocument): boolean {
+  if (!isGermanSupplierAndCustomer(document)) {
+    return true;
   }
   const lineCodes = getLines(document).map(line => line.item.classifiedTaxCategory.id);
   const allowanceCodes = getAllAllowanceCharges(document)
@@ -23,9 +22,11 @@ export function validateDeR016(document: PeppolDocument): SchematronRuleResult {
     .filter((code): code is string => code !== undefined);
   const usesSupportedCode = [...lineCodes, ...allowanceCodes].some(code => SUPPORTED_VAT_CODES.has(code));
   if (!usesSupportedCode) {
-    return schematronResult(rule, true);
+    return true;
   }
   const hasTaxRepresentative = Boolean(document.taxRepresentativeParty);
   const hasSellerTaxId = document.accountingSupplierParty.partyTaxSchemes?.some(scheme => scheme.companyId.trim() !== '') ?? false;
-  return schematronResult(rule, hasTaxRepresentative || hasSellerTaxId);
+  return hasTaxRepresentative || hasSellerTaxId;
 }
+
+export const validateDeR016 = schematronRule(rule, evaluateDeR016);

package/src/schematron/de/de-r-017.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 { isGermanSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DE-R-017',
@@ -13,10 +12,12 @@ const rule = {
 
 const ALLOWED_CODES = new Set(['326', '380', '384', '389', '381', '875', '876', '877']);
 
-export function validateDeR017(document: PeppolDocument): SchematronRuleResult {
-  if (!isSupplierGermany(document) || !isCustomerGermany(document)) {
-    return schematronResult(rule, true);
+function evaluateDeR017(document: PeppolDocument): boolean {
+  if (!isGermanSupplierAndCustomer(document)) {
+    return true;
   }
   const code = 'invoiceTypeCode' in document ? document.invoiceTypeCode : 'creditNoteTypeCode' in document ? document.creditNoteTypeCode : undefined;
-  return schematronResult(rule, code === undefined || ALLOWED_CODES.has(code));
+  return code === undefined || ALLOWED_CODES.has(code);
 }
+
+export const validateDeR017 = schematronRule(rule, evaluateDeR017);

package/src/schematron/de/de-r-018.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 { isGermanSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DE-R-018',
@@ -13,18 +12,20 @@ const rule = {
 
 const SKONTO_REGEX = /^#(SKONTO)#TAGE=([0-9]+#PROZENT=[0-9]+\.[0-9]{2})(#BASISBETRAG=-?[0-9]+\.[0-9]{2})?#$/;
 
-export function validateDeR018(document: PeppolDocument): SchematronRuleResult {
-  if (!isSupplierGermany(document) || !isCustomerGermany(document)) {
-    return schematronResult(rule, true);
+function evaluateDeR018(document: PeppolDocument): boolean {
+  if (!isGermanSupplierAndCustomer(document)) {
+    return true;
   }
   const note = document.paymentTerms?.note;
   if (note === undefined) {
-    return schematronResult(rule, true);
+    return true;
   }
   const lines = note.split(/\r?\n/).filter(line => line.startsWith('#'));
   if (lines.length === 0) {
-    return schematronResult(rule, true);
+    return true;
   }
   const passed = lines.every(line => SKONTO_REGEX.test(line.trim()));
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateDeR018 = schematronRule(rule, evaluateDeR018);

package/src/schematron/de/de-r-019.ts

@@ -1,9 +1,8 @@
-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 { isValidIBAN } from '#/peppol-validations/is-valid-iban';
-import { isCustomerGermany, isSupplierGermany, schematronResult } from '#/schematron/helpers';
+import { isGermanSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DE-R-019',
@@ -12,9 +11,9 @@ const rule = {
     'The element "Payment account identifier" (BT-84) should contain a valid IBAN if code 58 SEPA is provided in "Payment means type code" (BT-81).',
 } as const satisfies SchematronRule;
 
-export function validateDeR019(document: PeppolDocument): SchematronRuleResult {
-  if (!isSupplierGermany(document) || !isCustomerGermany(document)) {
-    return schematronResult(rule, true);
+function evaluateDeR019(document: PeppolDocument): boolean {
+  if (!isGermanSupplierAndCustomer(document)) {
+    return true;
   }
   const passed = (document.paymentMeans ?? []).every(payment => {
     if (payment.paymentMeansCode.code !== '58') {
@@ -23,5 +22,7 @@ export function validateDeR019(document: PeppolDocument): SchematronRuleResult {
     const accountId = payment.payeeFinancialAccount?.id;
     return accountId === undefined || isValidIBAN(accountId);
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateDeR019 = schematronRule(rule, evaluateDeR019);

package/src/schematron/de/de-r-020.ts

@@ -1,9 +1,8 @@
-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 { isValidIBAN } from '#/peppol-validations/is-valid-iban';
-import { isCustomerGermany, isSupplierGermany, schematronResult } from '#/schematron/helpers';
+import { isGermanSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DE-R-020',
@@ -12,9 +11,9 @@ const rule = {
     'The element "Debited account identifier" (BT-91) should contain a valid IBAN if code 59 SEPA is provided in "Payment means type code" (BT-81). ',
 } as const satisfies SchematronRule;
 
-export function validateDeR020(document: PeppolDocument): SchematronRuleResult {
-  if (!isSupplierGermany(document) || !isCustomerGermany(document)) {
-    return schematronResult(rule, true);
+function evaluateDeR020(document: PeppolDocument): boolean {
+  if (!isGermanSupplierAndCustomer(document)) {
+    return true;
   }
   const passed = (document.paymentMeans ?? []).every(payment => {
     if (payment.paymentMeansCode.code !== '59') {
@@ -23,5 +22,7 @@ export function validateDeR020(document: PeppolDocument): SchematronRuleResult {
     const debitedAccountId = payment.paymentMandate?.payerFinancialAccountId?.id;
     return debitedAccountId === undefined || isValidIBAN(debitedAccountId);
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateDeR020 = schematronRule(rule, evaluateDeR020);

package/src/schematron/de/de-r-022.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 { isGermanSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DE-R-022',
@@ -11,13 +10,15 @@ const rule = {
     'Attached documents provided with an invoice in "ADDITIONAL SUPPORTING DOCUMENTS" (BG-24) shall have a unique filename (non case-sensitive) within the element "Attached document" (BT-125).',
 } as const satisfies SchematronRule;
 
-export function validateDeR022(document: PeppolDocument): SchematronRuleResult {
-  if (!isSupplierGermany(document) || !isCustomerGermany(document)) {
-    return schematronResult(rule, true);
+function evaluateDeR022(document: PeppolDocument): boolean {
+  if (!isGermanSupplierAndCustomer(document)) {
+    return true;
   }
   const filenames = (document.additionalDocumentReferences ?? [])
     .map(ref => ref.attachment?.embeddedDocumentBinaryObject?.filename)
     .filter((filename): filename is string => filename !== undefined)
     .map(filename => filename.toLowerCase());
-  return schematronResult(rule, new Set(filenames).size === filenames.length);
+  return new Set(filenames).size === filenames.length;
 }
+
+export const validateDeR022 = schematronRule(rule, evaluateDeR022);

package/src/schematron/de/de-r-023-1.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 { isGermanSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DE-R-023-1',
@@ -12,9 +11,9 @@ const rule = {
 
 const CREDIT_TRANSFER_CODES = new Set(['30', '58']);
 
-export function validateDeR023_1(document: PeppolDocument): SchematronRuleResult {
-  if (!isSupplierGermany(document) || !isCustomerGermany(document)) {
-    return schematronResult(rule, true);
+function evaluateDeR023_1(document: PeppolDocument): boolean {
+  if (!isGermanSupplierAndCustomer(document)) {
+    return true;
   }
   const passed = (document.paymentMeans ?? []).every(payment => {
     if (!CREDIT_TRANSFER_CODES.has(payment.paymentMeansCode.code)) {
@@ -22,5 +21,7 @@ export function validateDeR023_1(document: PeppolDocument): SchematronRuleResult
     }
     return Boolean(payment.payeeFinancialAccount);
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateDeR023_1 = schematronRule(rule, evaluateDeR023_1);

package/src/schematron/de/de-r-023-2.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 { isGermanSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DE-R-023-2',
@@ -12,9 +11,9 @@ const rule = {
 
 const CREDIT_TRANSFER_CODES = new Set(['30', '58']);
 
-export function validateDeR023_2(document: PeppolDocument): SchematronRuleResult {
-  if (!isSupplierGermany(document) || !isCustomerGermany(document)) {
-    return schematronResult(rule, true);
+function evaluateDeR023_2(document: PeppolDocument): boolean {
+  if (!isGermanSupplierAndCustomer(document)) {
+    return true;
   }
   const passed = (document.paymentMeans ?? []).every(payment => {
     if (!CREDIT_TRANSFER_CODES.has(payment.paymentMeansCode.code)) {
@@ -22,5 +21,7 @@ export function validateDeR023_2(document: PeppolDocument): SchematronRuleResult
     }
     return !payment.cardAccount && !payment.paymentMandate;
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateDeR023_2 = schematronRule(rule, evaluateDeR023_2);

package/src/schematron/de/de-r-024-1.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 { isGermanSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DE-R-024-1',
@@ -13,9 +12,9 @@ const rule = {
 
 const CARD_CODES = new Set(['48', '54', '55']);
 
-export function validateDeR024_1(document: PeppolDocument): SchematronRuleResult {
-  if (!isSupplierGermany(document) || !isCustomerGermany(document)) {
-    return schematronResult(rule, true);
+function evaluateDeR024_1(document: PeppolDocument): boolean {
+  if (!isGermanSupplierAndCustomer(document)) {
+    return true;
   }
   const passed = (document.paymentMeans ?? []).every(payment => {
     if (!CARD_CODES.has(payment.paymentMeansCode.code)) {
@@ -23,5 +22,7 @@ export function validateDeR024_1(document: PeppolDocument): SchematronRuleResult
     }
     return Boolean(payment.cardAccount);
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateDeR024_1 = schematronRule(rule, evaluateDeR024_1);

package/src/schematron/de/de-r-024-2.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 { isGermanSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DE-R-024-2',
@@ -12,9 +11,9 @@ const rule = {
 
 const CARD_CODES = new Set(['48', '54', '55']);
 
-export function validateDeR024_2(document: PeppolDocument): SchematronRuleResult {
-  if (!isSupplierGermany(document) || !isCustomerGermany(document)) {
-    return schematronResult(rule, true);
+function evaluateDeR024_2(document: PeppolDocument): boolean {
+  if (!isGermanSupplierAndCustomer(document)) {
+    return true;
   }
   const passed = (document.paymentMeans ?? []).every(payment => {
     if (!CARD_CODES.has(payment.paymentMeansCode.code)) {
@@ -22,5 +21,7 @@ export function validateDeR024_2(document: PeppolDocument): SchematronRuleResult
     }
     return !payment.payeeFinancialAccount && !payment.paymentMandate;
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateDeR024_2 = schematronRule(rule, evaluateDeR024_2);

package/src/schematron/de/de-r-025-1.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 { isGermanSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DE-R-025-1',
@@ -10,9 +9,9 @@ const rule = {
   message: 'If "Payment means type code" (BT-81) contains a code for direct debit (59), "DIRECT DEBIT" (BG-19) shall be provided.',
 } as const satisfies SchematronRule;
 
-export function validateDeR025_1(document: PeppolDocument): SchematronRuleResult {
-  if (!isSupplierGermany(document) || !isCustomerGermany(document)) {
-    return schematronResult(rule, true);
+function evaluateDeR025_1(document: PeppolDocument): boolean {
+  if (!isGermanSupplierAndCustomer(document)) {
+    return true;
   }
   const passed = (document.paymentMeans ?? []).every(payment => {
     if (payment.paymentMeansCode.code !== '59') {
@@ -20,5 +19,7 @@ export function validateDeR025_1(document: PeppolDocument): SchematronRuleResult
     }
     return Boolean(payment.paymentMandate);
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateDeR025_1 = schematronRule(rule, evaluateDeR025_1);

package/src/schematron/de/de-r-025-2.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 { isGermanSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DE-R-025-2',
@@ -10,9 +9,9 @@ const rule = {
   message: 'If "Payment means type code" (BT-81) contains a code for direct debit (59), BG-17 and BG-18 shall not be provided.',
 } as const satisfies SchematronRule;
 
-export function validateDeR025_2(document: PeppolDocument): SchematronRuleResult {
-  if (!isSupplierGermany(document) || !isCustomerGermany(document)) {
-    return schematronResult(rule, true);
+function evaluateDeR025_2(document: PeppolDocument): boolean {
+  if (!isGermanSupplierAndCustomer(document)) {
+    return true;
   }
   const passed = (document.paymentMeans ?? []).every(payment => {
     if (payment.paymentMeansCode.code !== '59') {
@@ -20,5 +19,7 @@ export function validateDeR025_2(document: PeppolDocument): SchematronRuleResult
     }
     return !payment.payeeFinancialAccount && !payment.cardAccount;
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateDeR025_2 = schematronRule(rule, evaluateDeR025_2);

package/src/schematron/de/de-r-026.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 { isGermanSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DE-R-026',
@@ -11,15 +10,17 @@ const rule = {
     'If "Invoice type code" (BT-3) contains the code 384 (Corrected invoice), "PRECEDING INVOICE REFERENCE" (BG-3) should be provided at least once.',
 } as const satisfies SchematronRule;
 
-export function validateDeR026(document: PeppolDocument): SchematronRuleResult {
-  if (!isSupplierGermany(document) || !isCustomerGermany(document)) {
-    return schematronResult(rule, true);
+function evaluateDeR026(document: PeppolDocument): boolean {
+  if (!isGermanSupplierAndCustomer(document)) {
+    return true;
   }
   const invoiceTypeCode = 'invoiceTypeCode' in document ? document.invoiceTypeCode : undefined;
   const creditNoteTypeCode = 'creditNoteTypeCode' in document ? document.creditNoteTypeCode : undefined;
   if (invoiceTypeCode !== '384' && creditNoteTypeCode !== '384') {
-    return schematronResult(rule, true);
+    return true;
   }
   const hasPrecedingInvoiceReference = (document.billingReferences?.length ?? 0) > 0;
-  return schematronResult(rule, hasPrecedingInvoiceReference);
+  return hasPrecedingInvoiceReference;
 }
+
+export const validateDeR026 = schematronRule(rule, evaluateDeR026);

package/src/schematron/de/de-r-027.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 { isGermanSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DE-R-027',
@@ -12,10 +11,12 @@ const rule = {
 
 const TELEPHONE_REGEX = /.*([0-9].*){3,}.*/;
 
-export function validateDeR027(document: PeppolDocument): SchematronRuleResult {
-  if (!isSupplierGermany(document) || !isCustomerGermany(document)) {
-    return schematronResult(rule, true);
+function evaluateDeR027(document: PeppolDocument): boolean {
+  if (!isGermanSupplierAndCustomer(document)) {
+    return true;
   }
   const telephone = document.accountingSupplierParty.contact?.telephone;
-  return schematronResult(rule, telephone === undefined || TELEPHONE_REGEX.test(telephone.trim()));
+  return telephone === undefined || TELEPHONE_REGEX.test(telephone.trim());
 }
+
+export const validateDeR027 = schematronRule(rule, evaluateDeR027);