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

package/src/schematron/is/is-r-001.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 { getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'IS-R-001',
@@ -12,10 +11,12 @@ const rule = {
 
 const ALLOWED_CODES = new Set(['380', '381']);
 
-export function validateIsR001(document: PeppolDocument): SchematronRuleResult {
+function evaluateIsR001(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'IS') {
-    return schematronResult(rule, true);
+    return true;
   }
   const code = 'invoiceTypeCode' in document ? document.invoiceTypeCode : 'creditNoteTypeCode' in document ? document.creditNoteTypeCode : undefined;
-  return schematronResult(rule, code !== undefined && !code.includes(' ') && ALLOWED_CODES.has(code));
+  return code !== undefined && !code.includes(' ') && ALLOWED_CODES.has(code);
 }
+
+export const validateIsR001 = schematronRule(rule, evaluateIsR001);

package/src/schematron/is/is-r-002.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 { getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'IS-R-002',
@@ -10,10 +9,12 @@ const rule = {
   message: '[IS-R-002]-If seller is icelandic then it shall contain sellers legal id',
 } as const satisfies SchematronRule;
 
-export function validateIsR002(document: PeppolDocument): SchematronRuleResult {
+function evaluateIsR002(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'IS') {
-    return schematronResult(rule, true);
+    return true;
   }
   const companyId = document.accountingSupplierParty.partyLegalEntity.companyId;
-  return schematronResult(rule, Boolean(companyId?.id) && companyId?.schemeId === '0196');
+  return Boolean(companyId?.id) && companyId?.schemeId === '0196';
 }
+
+export const validateIsR002 = schematronRule(rule, evaluateIsR002);

package/src/schematron/is/is-r-003.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 { getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'IS-R-003',
@@ -10,10 +9,12 @@ const rule = {
   message: '[IS-R-003]-If seller is icelandic then it shall contain his address with street name and zip code',
 } as const satisfies SchematronRule;
 
-export function validateIsR003(document: PeppolDocument): SchematronRuleResult {
+function evaluateIsR003(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'IS') {
-    return schematronResult(rule, true);
+    return true;
   }
   const address = document.accountingSupplierParty.postalAddress;
-  return schematronResult(rule, Boolean(address.streetName) && Boolean(address.postalZone));
+  return Boolean(address.streetName) && Boolean(address.postalZone);
 }
+
+export const validateIsR003 = schematronRule(rule, evaluateIsR003);

package/src/schematron/is/is-r-004.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 { getCustomerCountry, getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getCustomerCountry, getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'IS-R-004',
@@ -10,10 +9,12 @@ const rule = {
   message: '[IS-R-004]-If seller and buyer are icelandic then the invoice shall contain the buyers icelandic legal identifier',
 } as const satisfies SchematronRule;
 
-export function validateIsR004(document: PeppolDocument): SchematronRuleResult {
+function evaluateIsR004(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'IS' || getCustomerCountry(document) !== 'IS') {
-    return schematronResult(rule, true);
+    return true;
   }
   const companyId = document.accountingCustomerParty.partyLegalEntity.companyId;
-  return schematronResult(rule, Boolean(companyId?.id) && companyId?.schemeId === '0196');
+  return Boolean(companyId?.id) && companyId?.schemeId === '0196';
 }
+
+export const validateIsR004 = schematronRule(rule, evaluateIsR004);

package/src/schematron/is/is-r-005.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 { getCustomerCountry, getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getCustomerCountry, getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'IS-R-005',
@@ -10,10 +9,12 @@ const rule = {
   message: '[IS-R-005]-If seller and buyer are icelandic then the invoice shall contain the buyers address with street name and zip code',
 } as const satisfies SchematronRule;
 
-export function validateIsR005(document: PeppolDocument): SchematronRuleResult {
+function evaluateIsR005(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'IS' || getCustomerCountry(document) !== 'IS') {
-    return schematronResult(rule, true);
+    return true;
   }
   const address = document.accountingCustomerParty.postalAddress;
-  return schematronResult(rule, Boolean(address.streetName) && Boolean(address.postalZone));
+  return Boolean(address.streetName) && Boolean(address.postalZone);
 }
+
+export const validateIsR005 = schematronRule(rule, evaluateIsR005);

package/src/schematron/is/is-r-006.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 { getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'IS-R-006',
@@ -10,17 +9,19 @@ const rule = {
   message: '[IS-R-006]-If seller is icelandic and payment means code is 9 then a 12 digit account id must exist',
 } as const satisfies SchematronRule;
 
-export function validateIsR006(document: PeppolDocument): SchematronRuleResult {
+function evaluateIsR006(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'IS') {
-    return schematronResult(rule, true);
+    return true;
   }
   const code9Payments = (document.paymentMeans ?? []).filter(payment => payment.paymentMeansCode.code === '9');
   if (code9Payments.length === 0) {
-    return schematronResult(rule, true);
+    return true;
   }
   const passed = code9Payments.every(payment => {
     const accountId = payment.payeeFinancialAccount?.id;
     return typeof accountId === 'string' && accountId.trim().length === 12;
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateIsR006 = schematronRule(rule, evaluateIsR006);

package/src/schematron/is/is-r-007.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 { getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'IS-R-007',
@@ -10,17 +9,19 @@ const rule = {
   message: '[IS-R-007]-If seller is icelandic and payment means code is 42 then a 12 digit account id must exist',
 } as const satisfies SchematronRule;
 
-export function validateIsR007(document: PeppolDocument): SchematronRuleResult {
+function evaluateIsR007(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'IS') {
-    return schematronResult(rule, true);
+    return true;
   }
   const code42Payments = (document.paymentMeans ?? []).filter(payment => payment.paymentMeansCode.code === '42');
   if (code42Payments.length === 0) {
-    return schematronResult(rule, true);
+    return true;
   }
   const passed = code42Payments.every(payment => {
     const accountId = payment.payeeFinancialAccount?.id;
     return typeof accountId === 'string' && accountId.trim().length === 12;
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateIsR007 = schematronRule(rule, evaluateIsR007);

package/src/schematron/is/is-r-008.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 { getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'IS-R-008',
@@ -12,17 +11,19 @@ const rule = {
 
 const DATE_REGEX = /^\d{4}-\d{2}-\d{2}$/;
 
-export function validateIsR008(document: PeppolDocument): SchematronRuleResult {
+function evaluateIsR008(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'IS') {
-    return schematronResult(rule, true);
+    return true;
   }
   const eindagiReferences = (document.additionalDocumentReferences ?? []).filter(ref => ref.documentDescription === 'EINDAGI');
   if (eindagiReferences.length === 0) {
-    return schematronResult(rule, true);
+    return true;
   }
   const passed = eindagiReferences.every(ref => {
     const id = ref.id.id;
     return id.length === 10 && DATE_REGEX.test(id) && !Number.isNaN(Date.parse(id));
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateIsR008 = schematronRule(rule, evaluateIsR008);

package/src/schematron/is/is-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 { getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'IS-R-009',
@@ -10,13 +9,15 @@ const rule = {
   message: '[IS-R-009]-If seller is icelandic and invoice contains supporting description EINDAGI invoice must have due date',
 } as const satisfies SchematronRule;
 
-export function validateIsR009(document: PeppolDocument): SchematronRuleResult {
+function evaluateIsR009(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'IS') {
-    return schematronResult(rule, true);
+    return true;
   }
   const hasEindagi = (document.additionalDocumentReferences ?? []).some(ref => ref.documentDescription === 'EINDAGI');
   if (!hasEindagi) {
-    return schematronResult(rule, true);
+    return true;
   }
-  return schematronResult(rule, Boolean(document.dueDate));
+  return Boolean(document.dueDate);
 }
+
+export const validateIsR009 = schematronRule(rule, evaluateIsR009);

package/src/schematron/is/is-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 { getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'IS-R-010',
@@ -10,21 +9,23 @@ const rule = {
   message: '[IS-R-010]-If seller is icelandic and invoice contains supporting description EINDAGI the id date must be same or later than due date',
 } as const satisfies SchematronRule;
 
-export function validateIsR010(document: PeppolDocument): SchematronRuleResult {
+function evaluateIsR010(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'IS') {
-    return schematronResult(rule, true);
+    return true;
   }
   const eindagiReferences = (document.additionalDocumentReferences ?? []).filter(ref => ref.documentDescription === 'EINDAGI');
   if (eindagiReferences.length === 0) {
-    return schematronResult(rule, true);
+    return true;
   }
   const dueDate = document.dueDate;
   if (!dueDate) {
-    return schematronResult(rule, false);
+    return false;
   }
   const passed = eindagiReferences.every(ref => {
     const id = ref.id.id;
     return id >= dueDate;
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateIsR010 = schematronRule(rule, evaluateIsR010);

package/src/schematron/it/it-r-001.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 { getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'IT-R-001',
@@ -10,12 +9,14 @@ const rule = {
   message: '[IT-R-001] BT-32 (Seller tax registration identifier) - For Italian suppliers BT-32 minimum length 11 and maximum length shall be 16.',
 } as const satisfies SchematronRule;
 
-export function validateItR001(document: PeppolDocument): SchematronRuleResult {
+function evaluateItR001(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'IT') {
-    return schematronResult(rule, true);
+    return true;
   }
   const companyIds =
     document.accountingSupplierParty.partyTaxSchemes?.filter(scheme => scheme.taxSchemeId.id !== 'VAT').map(scheme => scheme.companyId) ?? [];
   const passed = companyIds.every(id => /^[A-Z0-9]{11,16}$/.test(id));
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateItR001 = schematronRule(rule, evaluateItR001);

package/src/schematron/it/it-r-002.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 { getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'IT-R-002',
@@ -10,10 +9,12 @@ const rule = {
   message: '[IT-R-002] BT-35 (Seller address line 1) - Italian suppliers MUST provide the postal address line 1',
 } as const satisfies SchematronRule;
 
-export function validateItR002(document: PeppolDocument): SchematronRuleResult {
+function evaluateItR002(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'IT') {
-    return schematronResult(rule, true);
+    return true;
   }
   const streetName = document.accountingSupplierParty.postalAddress.streetName;
-  return schematronResult(rule, typeof streetName === 'string' && streetName.trim() !== '');
+  return typeof streetName === 'string' && streetName.trim() !== '';
 }
+
+export const validateItR002 = schematronRule(rule, evaluateItR002);

package/src/schematron/it/it-r-003.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 { getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'IT-R-003',
@@ -10,10 +9,12 @@ const rule = {
   message: '[IT-R-003] BT-37 (Seller city) - Italian suppliers MUST provide the postal address city',
 } as const satisfies SchematronRule;
 
-export function validateItR003(document: PeppolDocument): SchematronRuleResult {
+function evaluateItR003(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'IT') {
-    return schematronResult(rule, true);
+    return true;
   }
   const cityName = document.accountingSupplierParty.postalAddress.cityName;
-  return schematronResult(rule, typeof cityName === 'string' && cityName.trim() !== '');
+  return typeof cityName === 'string' && cityName.trim() !== '';
 }
+
+export const validateItR003 = schematronRule(rule, evaluateItR003);

package/src/schematron/it/it-r-004.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 { getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'IT-R-004',
@@ -10,10 +9,12 @@ const rule = {
   message: '[IT-R-004] BT-38 (Seller post code) - Italian suppliers MUST provide the postal address post code',
 } as const satisfies SchematronRule;
 
-export function validateItR004(document: PeppolDocument): SchematronRuleResult {
+function evaluateItR004(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'IT') {
-    return schematronResult(rule, true);
+    return true;
   }
   const postalZone = document.accountingSupplierParty.postalAddress.postalZone;
-  return schematronResult(rule, typeof postalZone === 'string' && postalZone.trim() !== '');
+  return typeof postalZone === 'string' && postalZone.trim() !== '';
 }
+
+export const validateItR004 = schematronRule(rule, evaluateItR004);

package/src/schematron/nl/nl-r-001.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 { getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'NL-R-001',
@@ -11,10 +10,12 @@ const rule = {
     '[NL-R-001] For suppliers in the Netherlands, if the document is a creditnote, the document MUST contain an invoice reference (cac:BillingReference/cac:InvoiceDocumentReference/cbc:ID)',
 } as const satisfies SchematronRule;
 
-export function validateNlR001(document: PeppolDocument): SchematronRuleResult {
+function evaluateNlR001(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'NL' || !('creditNoteTypeCode' in document)) {
-    return schematronResult(rule, true);
+    return true;
   }
   const invoiceReference = document.billingReferences?.some(ref => Boolean(ref.invoiceDocumentReference.id));
-  return schematronResult(rule, Boolean(invoiceReference));
+  return Boolean(invoiceReference);
 }
+
+export const validateNlR001 = schematronRule(rule, evaluateNlR001);

package/src/schematron/nl/nl-r-002.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 { getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'NL-R-002',
@@ -11,10 +10,12 @@ const rule = {
     "[NL-R-002] For suppliers in the Netherlands the supplier's address (cac:AccountingSupplierParty/cac:Party/cac:PostalAddress) MUST contain street name (cbc:StreetName), city (cbc:CityName) and post code (cbc:PostalZone)",
 } as const satisfies SchematronRule;
 
-export function validateNlR002(document: PeppolDocument): SchematronRuleResult {
+function evaluateNlR002(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'NL') {
-    return schematronResult(rule, true);
+    return true;
   }
   const address = document.accountingSupplierParty.postalAddress;
-  return schematronResult(rule, Boolean(address.streetName) && Boolean(address.cityName) && Boolean(address.postalZone));
+  return Boolean(address.streetName) && Boolean(address.cityName) && Boolean(address.postalZone);
 }
+
+export const validateNlR002 = schematronRule(rule, evaluateNlR002);

package/src/schematron/nl/nl-r-003.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 { getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'NL-R-003',
@@ -12,13 +11,15 @@ const rule = {
 
 const ALLOWED_SCHEMES = new Set(['0106', '0190']);
 
-export function validateNlR003(document: PeppolDocument): SchematronRuleResult {
+function evaluateNlR003(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'NL') {
-    return schematronResult(rule, true);
+    return true;
   }
   const companyId = document.accountingSupplierParty.partyLegalEntity.companyId;
   if (!companyId?.id) {
-    return schematronResult(rule, true);
+    return true;
   }
-  return schematronResult(rule, Boolean(companyId.schemeId && ALLOWED_SCHEMES.has(companyId.schemeId)));
+  return Boolean(companyId.schemeId && ALLOWED_SCHEMES.has(companyId.schemeId));
 }
+
+export const validateNlR003 = schematronRule(rule, evaluateNlR003);

package/src/schematron/nl/nl-r-004.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 { getCustomerCountry, getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getCustomerCountry, getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'NL-R-004',
@@ -11,10 +10,12 @@ const rule = {
     '[NL-R-004] For suppliers in the Netherlands, if the customer is in the Netherlands, the customer address (cac:AccountingCustomerParty/cac:Party/cac:PostalAddress) MUST contain the street name (cbc:StreetName), the city (cbc:CityName) and post code (cbc:PostalZone)',
 } as const satisfies SchematronRule;
 
-export function validateNlR004(document: PeppolDocument): SchematronRuleResult {
+function evaluateNlR004(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'NL' || getCustomerCountry(document) !== 'NL') {
-    return schematronResult(rule, true);
+    return true;
   }
   const address = document.accountingCustomerParty.postalAddress;
-  return schematronResult(rule, Boolean(address.streetName) && Boolean(address.cityName) && Boolean(address.postalZone));
+  return Boolean(address.streetName) && Boolean(address.cityName) && Boolean(address.postalZone);
 }
+
+export const validateNlR004 = schematronRule(rule, evaluateNlR004);

package/src/schematron/nl/nl-r-005.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 { getCustomerCountry, getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getCustomerCountry, getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'NL-R-005',
@@ -13,13 +12,15 @@ const rule = {
 
 const ALLOWED_SCHEMES = new Set(['0106', '0190']);
 
-export function validateNlR005(document: PeppolDocument): SchematronRuleResult {
+function evaluateNlR005(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'NL' || getCustomerCountry(document) !== 'NL') {
-    return schematronResult(rule, true);
+    return true;
   }
   const companyId = document.accountingCustomerParty.partyLegalEntity.companyId;
   if (!companyId?.id) {
-    return schematronResult(rule, true);
+    return true;
   }
-  return schematronResult(rule, Boolean(companyId.schemeId && ALLOWED_SCHEMES.has(companyId.schemeId)));
+  return Boolean(companyId.schemeId && ALLOWED_SCHEMES.has(companyId.schemeId));
 }
+
+export const validateNlR005 = schematronRule(rule, evaluateNlR005);

package/src/schematron/nl/nl-r-006.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 { getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'NL-R-006',
@@ -11,14 +10,16 @@ const rule = {
     "[NL-R-006] For suppliers in the Netherlands, if the fiscal representative is in the Netherlands, the representative's address (cac:TaxRepresentativeParty/cac:PostalAddress) MUST contain street name (cbc:StreetName), city (cbc:CityName) and post code (cbc:PostalZone)",
 } as const satisfies SchematronRule;
 
-export function validateNlR006(document: PeppolDocument): SchematronRuleResult {
+function evaluateNlR006(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'NL') {
-    return schematronResult(rule, true);
+    return true;
   }
   const taxRep = document.taxRepresentativeParty;
   if (!taxRep || taxRep.postalAddress.countryCode.identificationCode.toUpperCase() !== 'NL') {
-    return schematronResult(rule, true);
+    return true;
   }
   const address = taxRep.postalAddress;
-  return schematronResult(rule, Boolean(address.streetName) && Boolean(address.cityName) && Boolean(address.postalZone));
+  return Boolean(address.streetName) && Boolean(address.cityName) && Boolean(address.postalZone);
 }
+
+export const validateNlR006 = schematronRule(rule, evaluateNlR006);

package/src/schematron/nl/nl-r-007.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 { getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'NL-R-007',
@@ -11,15 +10,17 @@ const rule = {
     '[NL-R-007] For suppliers in the Netherlands, the supplier MUST provide a means of payment (cac:PaymentMeans) if the payment is from customer to supplier',
 } as const satisfies SchematronRule;
 
-export function validateNlR007(document: PeppolDocument): SchematronRuleResult {
+function evaluateNlR007(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'NL') {
-    return schematronResult(rule, true);
+    return true;
   }
   const payable = document.legalMonetaryTotal.payableAmount.value;
   const isInvoice = 'invoiceLines' in document;
   const isCreditNote = 'creditNoteLines' in document;
   if ((isInvoice && payable <= 0) || (isCreditNote && payable >= 0)) {
-    return schematronResult(rule, true);
+    return true;
   }
-  return schematronResult(rule, (document.paymentMeans?.length ?? 0) > 0);
+  return (document.paymentMeans?.length ?? 0) > 0;
 }
+
+export const validateNlR007 = schematronRule(rule, evaluateNlR007);