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

package/src/schematron/de/de-r-028.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-028',
@@ -14,10 +13,12 @@ const rule = {
 const EMAIL_REGEX =
   /^[a-zA-Z0-9!#$%&"*+/=?^_`{|}~-]+(\.[a-zA-Z0-9!#$%&"*+/=?^_`{|}~-]+)*@([a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?$/;
 
-export function validateDeR028(document: PeppolDocument): SchematronRuleResult {
-  if (!isSupplierGermany(document) || !isCustomerGermany(document)) {
-    return schematronResult(rule, true);
+function evaluateDeR028(document: PeppolDocument): boolean {
+  if (!isGermanSupplierAndCustomer(document)) {
+    return true;
   }
   const email = document.accountingSupplierParty.contact?.electronicMail;
-  return schematronResult(rule, email === undefined || EMAIL_REGEX.test(email.trim()));
+  return email === undefined || EMAIL_REGEX.test(email.trim());
 }
+
+export const validateDeR028 = schematronRule(rule, evaluateDeR028);

package/src/schematron/de/de-r-030.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-030',
@@ -10,16 +9,18 @@ const rule = {
   message: 'If the group "DIRECT DEBIT" (BG-19) is delivered, the element "Bank assigned creditor identifier" (BT-90) shall be provided.',
 } as const satisfies SchematronRule;
 
-export function validateDeR030(document: PeppolDocument): SchematronRuleResult {
-  if (!isSupplierGermany(document) || !isCustomerGermany(document)) {
-    return schematronResult(rule, true);
+function evaluateDeR030(document: PeppolDocument): boolean {
+  if (!isGermanSupplierAndCustomer(document)) {
+    return true;
   }
   const hasPaymentMandate = (document.paymentMeans ?? []).some(payment => Boolean(payment.paymentMandate));
   if (!hasPaymentMandate) {
-    return schematronResult(rule, true);
+    return true;
   }
   const hasSepaCreditorId =
     document.accountingSupplierParty.partyIdentification?.id?.schemeId === 'SEPA' ||
     document.payeeParty?.partyIdentification?.id?.schemeId === 'SEPA';
-  return schematronResult(rule, hasSepaCreditorId);
+  return hasSepaCreditorId;
 }
+
+export const validateDeR030 = schematronRule(rule, evaluateDeR030);

package/src/schematron/de/de-r-031.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-031',
@@ -10,9 +9,9 @@ const rule = {
   message: 'If the group "DIRECT DEBIT" (BG-19) is delivered, the element "Debited account identifier" (BT-91) shall be provided.',
 } as const satisfies SchematronRule;
 
-export function validateDeR031(document: PeppolDocument): SchematronRuleResult {
-  if (!isSupplierGermany(document) || !isCustomerGermany(document)) {
-    return schematronResult(rule, true);
+function evaluateDeR031(document: PeppolDocument): boolean {
+  if (!isGermanSupplierAndCustomer(document)) {
+    return true;
   }
   const passed = (document.paymentMeans ?? []).every(payment => {
     if (!payment.paymentMandate) {
@@ -20,5 +19,7 @@ export function validateDeR031(document: PeppolDocument): SchematronRuleResult {
     }
     return Boolean(payment.paymentMandate.payerFinancialAccountId?.id);
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateDeR031 = schematronRule(rule, evaluateDeR031);

package/src/schematron/dk/dk-r-002.ts

@@ -1,15 +1,16 @@
-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: 'DK-R-002', level: 'fatal', message: 'Danish suppliers MUST provide legal entity (CVR-number)' } as const satisfies SchematronRule;
 
-export function validateDkR002(document: PeppolDocument): SchematronRuleResult {
+function evaluateDkR002(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'DK') {
-    return schematronResult(rule, true);
+    return true;
   }
   const companyId = document.accountingSupplierParty.partyLegalEntity.companyId?.id;
-  return schematronResult(rule, typeof companyId === 'string' && companyId.trim() !== '');
+  return typeof companyId === 'string' && companyId.trim() !== '';
 }
+
+export const validateDkR002 = schematronRule(rule, evaluateDkR002);

package/src/schematron/dk/dk-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 { getCustomerCountry, getLines, getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getLines, isDanishSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DK-R-003',
@@ -12,9 +11,9 @@ const rule = {
 
 const ALLOWED_VERSIONS = new Set(['19.05.01', '19.0501', '26.08.01', '26.0801']);
 
-export function validateDkR003(document: PeppolDocument): SchematronRuleResult {
-  if (getSupplierCountry(document) !== 'DK' || getCustomerCountry(document) !== 'DK') {
-    return schematronResult(rule, true);
+function evaluateDkR003(document: PeppolDocument): boolean {
+  if (!isDanishSupplierAndCustomer(document)) {
+    return true;
   }
   const passed = getLines(document).every(line =>
     (line.item.commodityClassifications ?? []).every(classification => {
@@ -25,5 +24,7 @@ export function validateDkR003(document: PeppolDocument): SchematronRuleResult {
       );
     })
   );
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateDkR003 = schematronRule(rule, evaluateDkR003);

package/src/schematron/dk/dk-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 { getAllAllowanceCharges, getCustomerCountry, getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getAllAllowanceCharges, isDanishSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DK-R-004',
@@ -11,9 +10,9 @@ const rule = {
     'When specifying non-VAT Taxes for Danish customers, Danish suppliers MUST use the AllowanceChargeReasonCode="ZZZ" and MUST be specified in AllowanceChargeReason; Either as the 4-digit Tax category or must include a #, but the # is not allowed as first and last character',
 } as const satisfies SchematronRule;
 
-export function validateDkR004(document: PeppolDocument): SchematronRuleResult {
-  if (getSupplierCountry(document) !== 'DK' || getCustomerCountry(document) !== 'DK') {
-    return schematronResult(rule, true);
+function evaluateDkR004(document: PeppolDocument): boolean {
+  if (!isDanishSupplierAndCustomer(document)) {
+    return true;
   }
   const passed = getAllAllowanceCharges(document).every(ac => {
     if (ac.reasonCode !== 'ZZZ') {
@@ -27,5 +26,7 @@ export function validateDkR004(document: PeppolDocument): SchematronRuleResult {
     const hasHashInside = reason.includes('#') && !reason.startsWith('#') && !reason.endsWith('#');
     return is4DigitTaxCategory || hasHashInside;
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateDkR004 = schematronRule(rule, evaluateDkR004);

package/src/schematron/dk/dk-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 { isDanishSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DK-R-005',
@@ -12,10 +11,12 @@ const rule = {
 
 const ALLOWED_CODES = new Set(['1', '10', '31', '42', '48', '49', '50', '58', '59', '93', '97']);
 
-export function validateDkR005(document: PeppolDocument): SchematronRuleResult {
-  if (getSupplierCountry(document) !== 'DK' || getCustomerCountry(document) !== 'DK') {
-    return schematronResult(rule, true);
+function evaluateDkR005(document: PeppolDocument): boolean {
+  if (!isDanishSupplierAndCustomer(document)) {
+    return true;
   }
   const passed = (document.paymentMeans ?? []).every(payment => ALLOWED_CODES.has(payment.paymentMeansCode.code));
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateDkR005 = schematronRule(rule, evaluateDkR005);

package/src/schematron/dk/dk-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 { getCustomerCountry, getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { isDanishSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DK-R-006',
@@ -12,9 +11,9 @@ const rule = {
 
 const REQUIRED_CODES = new Set(['31', '42']);
 
-export function validateDkR006(document: PeppolDocument): SchematronRuleResult {
-  if (getSupplierCountry(document) !== 'DK' || getCustomerCountry(document) !== 'DK') {
-    return schematronResult(rule, true);
+function evaluateDkR006(document: PeppolDocument): boolean {
+  if (!isDanishSupplierAndCustomer(document)) {
+    return true;
   }
   const passed = (document.paymentMeans ?? []).every(payment => {
     if (!REQUIRED_CODES.has(payment.paymentMeansCode.code)) {
@@ -24,5 +23,7 @@ export function validateDkR006(document: PeppolDocument): SchematronRuleResult {
     const branchId = payment.payeeFinancialAccount?.financialInstitutionBranch?.id;
     return typeof accountId === 'string' && accountId.trim() !== '' && typeof branchId === 'string' && branchId.trim() !== '';
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateDkR006 = schematronRule(rule, evaluateDkR006);

package/src/schematron/dk/dk-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 { getCustomerCountry, getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { isDanishSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DK-R-007',
@@ -10,9 +9,9 @@ const rule = {
   message: 'For Danish suppliers PaymentMandate/ID and PayerFinancialAccount/ID are mandatory when payment means is 49',
 } as const satisfies SchematronRule;
 
-export function validateDkR007(document: PeppolDocument): SchematronRuleResult {
-  if (getSupplierCountry(document) !== 'DK' || getCustomerCountry(document) !== 'DK') {
-    return schematronResult(rule, true);
+function evaluateDkR007(document: PeppolDocument): boolean {
+  if (!isDanishSupplierAndCustomer(document)) {
+    return true;
   }
   const passed = (document.paymentMeans ?? []).every(payment => {
     if (payment.paymentMeansCode.code !== '49') {
@@ -22,5 +21,7 @@ export function validateDkR007(document: PeppolDocument): SchematronRuleResult {
     const payerAccountId = payment.paymentMandate?.payerFinancialAccountId?.id;
     return typeof mandateId === 'string' && mandateId.trim() !== '' && typeof payerAccountId === 'string' && payerAccountId.trim() !== '';
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateDkR007 = schematronRule(rule, evaluateDkR007);

package/src/schematron/dk/dk-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 { getCustomerCountry, getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { isDanishSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DK-R-008',
@@ -11,9 +10,9 @@ const rule = {
     'For Danish Suppliers PaymentID is mandatory and MUST start with 01#, 04# or 15# (kortartkode), and PayeeFinancialAccount/ID (Giro kontonummer) is mandatory and must be 7 or 8 numerical characters long, when payment means equals 50 (Giro)',
 } as const satisfies SchematronRule;
 
-export function validateDkR008(document: PeppolDocument): SchematronRuleResult {
-  if (getSupplierCountry(document) !== 'DK' || getCustomerCountry(document) !== 'DK') {
-    return schematronResult(rule, true);
+function evaluateDkR008(document: PeppolDocument): boolean {
+  if (!isDanishSupplierAndCustomer(document)) {
+    return true;
   }
   const passed = (document.paymentMeans ?? []).every(payment => {
     if (payment.paymentMeansCode.code !== '50') {
@@ -24,5 +23,7 @@ export function validateDkR008(document: PeppolDocument): SchematronRuleResult {
     const startsWithValidPrefix = paymentId ? ['01#', '04#', '15#'].some(prefix => paymentId.startsWith(prefix)) : false;
     return startsWithValidPrefix && typeof giroAccountId === 'string' && /^[0-9]{7,8}$/.test(giroAccountId);
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateDkR008 = schematronRule(rule, evaluateDkR008);

package/src/schematron/dk/dk-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 { getCustomerCountry, getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { isDanishSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DK-R-009',
@@ -11,9 +10,9 @@ const rule = {
     'For Danish Suppliers if the PaymentID is prefixed with 04# or 15# the 16 digits instruction Id must be added to the PaymentID eg. "04#1234567890123456" when Payment means equals 50 (Giro)',
 } as const satisfies SchematronRule;
 
-export function validateDkR009(document: PeppolDocument): SchematronRuleResult {
-  if (getSupplierCountry(document) !== 'DK' || getCustomerCountry(document) !== 'DK') {
-    return schematronResult(rule, true);
+function evaluateDkR009(document: PeppolDocument): boolean {
+  if (!isDanishSupplierAndCustomer(document)) {
+    return true;
   }
   const passed = (document.paymentMeans ?? []).every(payment => {
     if (payment.paymentMeansCode.code !== '50' || !payment.paymentId) {
@@ -25,5 +24,7 @@ export function validateDkR009(document: PeppolDocument): SchematronRuleResult {
     }
     return true;
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateDkR009 = schematronRule(rule, evaluateDkR009);

package/src/schematron/dk/dk-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 { getCustomerCountry, getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { isDanishSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DK-R-010',
@@ -11,9 +10,9 @@ const rule = {
     'For Danish Suppliers using PaymentMeansCode 93, PaymentID is mandatory. The first three characters of the PaymentID MUST be 71#, 73# or 75# (kortartskode), and PayeeFinancialAccount/ID MUST be exactly 8 characters long.',
 } as const satisfies SchematronRule;
 
-export function validateDkR010(document: PeppolDocument): SchematronRuleResult {
-  if (getSupplierCountry(document) !== 'DK' || getCustomerCountry(document) !== 'DK') {
-    return schematronResult(rule, true);
+function evaluateDkR010(document: PeppolDocument): boolean {
+  if (!isDanishSupplierAndCustomer(document)) {
+    return true;
   }
   const passed = (document.paymentMeans ?? []).every(payment => {
     if (payment.paymentMeansCode.code !== '93') {
@@ -24,5 +23,7 @@ export function validateDkR010(document: PeppolDocument): SchematronRuleResult {
     const accountId = payment.payeeFinancialAccount?.id;
     return startsWithValidPrefix && typeof accountId === 'string' && accountId.length === 8;
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateDkR010 = schematronRule(rule, evaluateDkR010);

package/src/schematron/dk/dk-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 { getCustomerCountry, getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { isDanishSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DK-R-011',
@@ -11,9 +10,9 @@ const rule = {
     'For Danish Suppliers if the PaymentID is prefixed with 71# or 75# the 15-16 digits instruction Id must be added to the PaymentID eg. "71#1234567890123456" when payment Method equals 93 (FIK)',
 } as const satisfies SchematronRule;
 
-export function validateDkR011(document: PeppolDocument): SchematronRuleResult {
-  if (getSupplierCountry(document) !== 'DK' || getCustomerCountry(document) !== 'DK') {
-    return schematronResult(rule, true);
+function evaluateDkR011(document: PeppolDocument): boolean {
+  if (!isDanishSupplierAndCustomer(document)) {
+    return true;
   }
   const passed = (document.paymentMeans ?? []).every(payment => {
     if (payment.paymentMeansCode.code !== '93' || !payment.paymentId) {
@@ -25,5 +24,7 @@ export function validateDkR011(document: PeppolDocument): SchematronRuleResult {
     }
     return true;
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateDkR011 = schematronRule(rule, evaluateDkR011);

package/src/schematron/dk/dk-r-013.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 { isDanishSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DK-R-013',
@@ -11,14 +10,16 @@ const rule = {
     'For Danish Suppliers it is mandatory to use schemeID when PartyIdentification/ID is used for AccountingCustomerParty or AccountingSupplierParty',
 } as const satisfies SchematronRule;
 
-export function validateDkR013(document: PeppolDocument): SchematronRuleResult {
-  if (getSupplierCountry(document) !== 'DK' || getCustomerCountry(document) !== 'DK') {
-    return schematronResult(rule, true);
+function evaluateDkR013(document: PeppolDocument): boolean {
+  if (!isDanishSupplierAndCustomer(document)) {
+    return true;
   }
   const parties = [document.accountingSupplierParty, document.accountingCustomerParty];
   const passed = parties.every(party => {
     const id = party.partyIdentification?.id;
     return !id?.id || (typeof id.schemeId === 'string' && id.schemeId.trim() !== '');
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateDkR013 = schematronRule(rule, evaluateDkR013);

package/src/schematron/dk/dk-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 { getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DK-R-014',
@@ -11,11 +10,13 @@ const rule = {
     'For Danish Suppliers it is mandatory to specify schemeID as "0184" (DK CVR-number) when PartyLegalEntity/CompanyID is used for AccountingSupplierParty',
 } as const satisfies SchematronRule;
 
-export function validateDkR014(document: PeppolDocument): SchematronRuleResult {
+function evaluateDkR014(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'DK') {
-    return schematronResult(rule, true);
+    return true;
   }
   const companyId = document.accountingSupplierParty.partyLegalEntity.companyId;
   const passed = !companyId?.id || companyId.schemeId === '0184';
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateDkR014 = schematronRule(rule, evaluateDkR014);

package/src/schematron/dk/dk-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 { getCustomerCountry, getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { isDanishSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DK-R-016',
@@ -10,9 +9,11 @@ const rule = {
   message: 'For Danish Suppliers, a Credit note cannot have a negative total (PayableAmount)',
 } as const satisfies SchematronRule;
 
-export function validateDkR016(document: PeppolDocument): SchematronRuleResult {
-  if (!('creditNoteLines' in document) || getSupplierCountry(document) !== 'DK' || getCustomerCountry(document) !== 'DK') {
-    return schematronResult(rule, true);
+function evaluateDkR016(document: PeppolDocument): boolean {
+  if (!('creditNoteLines' in document) || !isDanishSupplierAndCustomer(document)) {
+    return true;
   }
-  return schematronResult(rule, document.legalMonetaryTotal.payableAmount.value >= 0);
+  return document.legalMonetaryTotal.payableAmount.value >= 0;
 }
+
+export const validateDkR016 = schematronRule(rule, evaluateDkR016);

package/src/schematron/dk/dk-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 { getCustomerCountry, getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { isDanishSupplierAndCustomer, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'DK-R-017',
@@ -11,11 +10,13 @@ const rule = {
     'For Danish Customers it is mandatory to specify schemeID as "0184" (DK CVR-number) when PartyLegalEntity/CompanyID is used for AccountingCustomerParty',
 } as const satisfies SchematronRule;
 
-export function validateDkR017(document: PeppolDocument): SchematronRuleResult {
-  if (getSupplierCountry(document) !== 'DK' || getCustomerCountry(document) !== 'DK') {
-    return schematronResult(rule, true);
+function evaluateDkR017(document: PeppolDocument): boolean {
+  if (!isDanishSupplierAndCustomer(document)) {
+    return true;
   }
   const companyId = document.accountingCustomerParty.partyLegalEntity.companyId;
   const passed = !companyId?.id || companyId.schemeId === '0184';
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateDkR017 = schematronRule(rule, evaluateDkR017);

package/src/schematron/errors.ts

@@ -0,0 +1,17 @@
+import { Schema } from 'effect';
+
+/**
+ * @description Failure of a single schematron rule against a document.
+ */
+export class SchematronRuleError extends Schema.TaggedError<SchematronRuleError>()('SchematronRuleError', {
+  id: Schema.String,
+  level: Schema.Literals(['fatal', 'warning']),
+  message: Schema.String,
+}) {}
+
+/**
+ * @description Failure of a schematron validation run, wrapping every rule that failed.
+ */
+export class SchematronValidationError extends Schema.TaggedError<SchematronValidationError>()('SchematronValidationError', {
+  errors: Schema.Array(SchematronRuleError),
+}) {}

package/src/schematron/gr/gr-r-001-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 { getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'GR-R-001-1',
@@ -10,10 +9,12 @@ const rule = {
   message: ' When the Supplier is Greek, the Invoice Id should consist of 6 segments',
 } as const satisfies SchematronRule;
 
-export function validateGrR001_1(document: PeppolDocument): SchematronRuleResult {
+function evaluateGrR001_1(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'GR' && getSupplierCountry(document) !== 'EL') {
-    return schematronResult(rule, true);
+    return true;
   }
   const segments = document.id.split('|');
-  return schematronResult(rule, segments.length === 6);
+  return segments.length === 6;
 }
+
+export const validateGrR001_1 = schematronRule(rule, evaluateGrR001_1);

package/src/schematron/gr/gr-r-001-2.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 { greekTinVerification } from '#/peppol-validations/greek-tin-verification';
-import { getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'GR-R-001-2',
@@ -12,19 +11,21 @@ const rule = {
     "When the Supplier is Greek, the Invoice Id first segment must be a valid TIN Number and match either the Supplier's or the Tax Representative's Tin Number",
 } as const satisfies SchematronRule;
 
-export function validateGrR001_2(document: PeppolDocument): SchematronRuleResult {
+function evaluateGrR001_2(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'GR' && getSupplierCountry(document) !== 'EL') {
-    return schematronResult(rule, true);
+    return true;
   }
   const segments = document.id.split('|');
   const firstSegment = segments[0];
   if (!firstSegment || firstSegment.trim().length !== 9) {
-    return schematronResult(rule, false);
+    return false;
   }
   const supplierTin = document.accountingSupplierParty.partyTaxSchemes
     ?.find(scheme => scheme.taxSchemeId.id.trim().toUpperCase() === 'VAT')
     ?.companyId.slice(2);
   const taxRepTin = document.taxRepresentativeParty?.partyTaxScheme.companyId.slice(2);
   const matchesTin = firstSegment === supplierTin || firstSegment === taxRepTin;
-  return schematronResult(rule, greekTinVerification(firstSegment) && matchesTin);
+  return greekTinVerification(firstSegment) && matchesTin;
 }
+
+export const validateGrR001_2 = schematronRule(rule, evaluateGrR001_2);