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

package/src/schematron/nl/nl-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 { getCustomerCountry, getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'NL-R-008',
@@ -13,10 +12,12 @@ const rule = {
 
 const ALLOWED_CODES = new Set(['30', '48', '49', '57', '58', '59']);
 
-export function validateNlR008(document: PeppolDocument): SchematronRuleResult {
+function evaluateNlR008(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'NL' || getCustomerCountry(document) !== 'NL') {
-    return schematronResult(rule, true);
+    return true;
   }
   const passed = (document.paymentMeans ?? []).every(payment => ALLOWED_CODES.has(payment.paymentMeansCode.code));
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateNlR008 = schematronRule(rule, evaluateNlR008);

package/src/schematron/nl/nl-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 { getLines, getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getLines, getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'NL-R-009',
@@ -11,13 +10,15 @@ const rule = {
     '[NL-R-009] For suppliers in the Netherlands, if an order line reference (cac:OrderLineReference/cbc:LineID) is used, there must be an order reference on the document level (cac:OrderReference/cbc:ID)',
 } as const satisfies SchematronRule;
 
-export function validateNlR009(document: PeppolDocument): SchematronRuleResult {
+function evaluateNlR009(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'NL') {
-    return schematronResult(rule, true);
+    return true;
   }
   const hasOrderLineReference = getLines(document).some(line => Boolean(line.orderLineReference?.lineId));
   if (!hasOrderLineReference) {
-    return schematronResult(rule, true);
+    return true;
   }
-  return schematronResult(rule, Boolean(document.orderReference?.id));
+  return Boolean(document.orderReference?.id);
 }
+
+export const validateNlR009 = schematronRule(rule, evaluateNlR009);

package/src/schematron/no/no-r-001.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 { isValidMod11 } from '#/peppol-validations/is-valid-mod11';
-import { getSupplierCountry, schematronResult } from '#/schematron/helpers';
+import { getSupplierCountry, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'NO-R-001',
@@ -12,15 +11,17 @@ const rule = {
     'For Norwegian suppliers, a VAT number MUST be the country code prefix NO followed by a valid Norwegian organization number (nine numbers) followed by the letters MVA.',
 } as const satisfies SchematronRule;
 
-export function validateNoR001(document: PeppolDocument): SchematronRuleResult {
+function evaluateNoR001(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'NO') {
-    return schematronResult(rule, true);
+    return true;
   }
   const vatCompanyId = document.accountingSupplierParty.partyTaxSchemes?.find(scheme => scheme.taxSchemeId.id === 'VAT')?.companyId;
   if (!vatCompanyId || vatCompanyId.slice(0, 2) !== 'NO') {
-    return schematronResult(rule, true);
+    return true;
   }
   const orgNumber = vatCompanyId.slice(2);
   const passed = /^[0-9]{9}MVA$/.test(orgNumber) && isValidMod11(orgNumber.slice(0, 9));
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validateNoR001 = schematronRule(rule, evaluateNoR001);

package/src/schematron/no/no-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: 'NO-R-002',
@@ -10,10 +9,12 @@ const rule = {
   message: 'For Norwegian suppliers, most invoice issuers are required to append "Foretaksregisteret" to their invoice.',
 } as const satisfies SchematronRule;
 
-export function validateNoR002(document: PeppolDocument): SchematronRuleResult {
+function evaluateNoR002(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'NO') {
-    return schematronResult(rule, true);
+    return true;
   }
   const taxCompanyId = document.accountingSupplierParty.partyTaxSchemes?.find(scheme => scheme.taxSchemeId.id === 'TAX')?.companyId;
-  return schematronResult(rule, taxCompanyId === 'Foretaksregisteret');
+  return taxCompanyId === 'Foretaksregisteret';
 }
+
+export const validateNoR002 = schematronRule(rule, evaluateNoR002);

package/src/schematron/peppol/cl/peppol-en16931-cl001.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';
 import { mimeCodesKeys } from '#/values/mime-codes.generated';
 
 const rule = {
@@ -11,11 +10,13 @@ const rule = {
   message: 'Mime code must be according to subset of IANA code list.',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931CL001(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931CL001(document: PeppolDocument): boolean {
   const mimeCodes = (document.additionalDocumentReferences ?? []).flatMap(ref => {
     const binary = ref.attachment?.embeddedDocumentBinaryObject;
     return binary ? [binary.mimeCode] : [];
   });
   const passed = mimeCodes.every(code => (mimeCodesKeys as ReadonlyArray<string>).includes(code));
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931CL001 = schematronRule(rule, evaluatePeppolEn16931CL001);

package/src/schematron/peppol/cl/peppol-en16931-cl002.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';
 import { allowanceChargeReasonCodesKeys } from '#/values/allowance-charge-reason-codes.generated';
 
 const rule = {
@@ -11,10 +10,12 @@ const rule = {
   message: 'Reason code MUST be according to subset of UNCL 5189 D.16B.',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931CL002(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931CL002(document: PeppolDocument): boolean {
   const allowances = getAllAllowanceCharges(document).filter(ac => !ac.chargeIndicator);
   const passed = allowances.every(
     ac => ac.reasonCode === undefined || (allowanceChargeReasonCodesKeys as ReadonlyArray<string>).includes(ac.reasonCode)
   );
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931CL002 = schematronRule(rule, evaluatePeppolEn16931CL002);

package/src/schematron/peppol/cl/peppol-en16931-cl003.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';
 import { chargeReasonCodesKeys } from '#/values/charge-reason-codes.generated';
 
 const rule = {
@@ -11,8 +10,10 @@ const rule = {
   message: 'Reason code MUST be according to UNCL 7161 D.16B.',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931CL003(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931CL003(document: PeppolDocument): boolean {
   const charges = getAllAllowanceCharges(document).filter(ac => ac.chargeIndicator);
   const passed = charges.every(ac => ac.reasonCode === undefined || (chargeReasonCodesKeys as ReadonlyArray<string>).includes(ac.reasonCode));
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931CL003 = schematronRule(rule, evaluatePeppolEn16931CL003);

package/src/schematron/peppol/cl/peppol-en16931-cl006.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';
 import { vatDateCodesKeys } from '#/values/vat-dates.generated';
 
 const rule = {
@@ -11,10 +10,12 @@ const rule = {
   message: 'Invoice period description code must be according to UNCL 2005 D.16B.',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931CL006(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931CL006(document: PeppolDocument): boolean {
   const descriptionCode = document.invoicePeriod?.descriptionCode;
   if (descriptionCode === undefined) {
-    return schematronResult(rule, true);
+    return true;
   }
-  return schematronResult(rule, (vatDateCodesKeys as ReadonlyArray<string>).includes(descriptionCode));
+  return (vatDateCodesKeys as ReadonlyArray<string>).includes(descriptionCode);
 }
+
+export const validatePeppolEn16931CL006 = schematronRule(rule, evaluatePeppolEn16931CL006);

package/src/schematron/peppol/cl/peppol-en16931-cl007.ts

@@ -1,8 +1,7 @@
-import type { PeppolDocument } from '#/document';
+import type { PeppolDocument } from '#/schemas/peppol-document-schema';
 import type { SchematronRule } from '#/schematron/helpers';
-import type { SchematronRuleResult } from '#/schematron/types';
 
-import { getLines, schematronResult } from '#/schematron/helpers';
+import { getLines, schematronRule } from '#/schematron/helpers';
 import { currencyCodesKeys } from '#/values/currency-code.generated';
 
 const rule = {
@@ -13,7 +12,7 @@ const rule = {
 
 const isValidCurrency = (code: string): boolean => (currencyCodesKeys as ReadonlyArray<string>).includes(code);
 
-export function validatePeppolEn16931CL007(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931CL007(document: PeppolDocument): boolean {
   const currencies: Array<string> = [document.documentCurrencyCode];
   if (document.taxCurrencyCode) {
     currencies.push(document.taxCurrencyCode);
@@ -39,5 +38,7 @@ export function validatePeppolEn16931CL007(document: PeppolDocument): Schematron
       currencies.push(subtotal.taxAmount.currencyId, subtotal.taxableAmount.currencyId);
     }
   }
-  return schematronResult(rule, currencies.every(isValidCurrency));
+  return currencies.every(isValidCurrency);
 }
+
+export const validatePeppolEn16931CL007 = schematronRule(rule, evaluatePeppolEn16931CL007);

package/src/schematron/peppol/cl/peppol-en16931-cl008.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';
 import { electronicAddressCodesKeys } from '#/values/eas-codes.generated';
 
 const rule = {
@@ -11,11 +10,13 @@ const rule = {
   message: 'Electronic address identifier scheme must be from the codelist "Electronic Address Identifier Scheme"',
 } as const satisfies SchematronRule;
 
-export function validatePeppolEn16931CL008(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolEn16931CL008(document: PeppolDocument): boolean {
   const schemeIds: Array<string | undefined> = [
     document.accountingSupplierParty.endpointId?.schemeId,
     document.accountingCustomerParty.endpointId?.schemeId,
   ];
   const passed = schemeIds.every(schemeId => schemeId === undefined || (electronicAddressCodesKeys as ReadonlyArray<string>).includes(schemeId));
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolEn16931CL008 = schematronRule(rule, evaluatePeppolEn16931CL008);

package/src/schematron/peppol/common/peppol-common-r040.ts

@@ -1,10 +1,9 @@
-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 { isValidGLN } from '#/peppol-validations/is-valid-gln';
 import { normalizeSpace } from '#/peppol-validations/normalize-space';
-import { getIdentifiersWithSchemeId, schematronResult } from '#/schematron/helpers';
+import { getIdentifiersWithSchemeId, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-COMMON-R040',
@@ -14,8 +13,10 @@ const rule = {
 
 const SCHEME_ID = '0088';
 
-export function validatePeppolCommonR040(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolCommonR040(document: PeppolDocument): boolean {
   const identifiers = getIdentifiersWithSchemeId(document).filter(i => i.schemeId === SCHEME_ID);
   const passed = identifiers.every(i => /^[0-9]+$/.test(normalizeSpace(i.id)) && isValidGLN(normalizeSpace(i.id)).success);
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolCommonR040 = schematronRule(rule, evaluatePeppolCommonR040);

package/src/schematron/peppol/common/peppol-common-r041.ts

@@ -1,10 +1,9 @@
-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 { isValidMod11 } from '#/peppol-validations/is-valid-mod11';
 import { normalizeSpace } from '#/peppol-validations/normalize-space';
-import { getIdentifiersWithSchemeId, schematronResult } from '#/schematron/helpers';
+import { getIdentifiersWithSchemeId, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-COMMON-R041',
@@ -14,8 +13,10 @@ const rule = {
 
 const SCHEME_ID = '0192';
 
-export function validatePeppolCommonR041(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolCommonR041(document: PeppolDocument): boolean {
   const identifiers = getIdentifiersWithSchemeId(document).filter(i => i.schemeId === SCHEME_ID);
   const passed = identifiers.every(i => /^[0-9]{9}$/.test(normalizeSpace(i.id)) && isValidMod11(normalizeSpace(i.id)));
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolCommonR041 = schematronRule(rule, evaluatePeppolCommonR041);

package/src/schematron/peppol/common/peppol-common-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 { getIdentifiersWithSchemeId, schematronResult } from '#/schematron/helpers';
+import { getIdentifiersWithSchemeId, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-COMMON-R042',
@@ -12,7 +11,7 @@ const rule = {
 
 const SCHEME_ID = '0184';
 
-export function validatePeppolCommonR042(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolCommonR042(document: PeppolDocument): boolean {
   const identifiers = getIdentifiersWithSchemeId(document).filter(i => i.schemeId === SCHEME_ID);
   const passed = identifiers.every(i => {
     const value = i.id;
@@ -20,5 +19,7 @@ export function validatePeppolCommonR042(document: PeppolDocument): SchematronRu
     const isDigitsOnly = value.length === 8 && value.replace(/[0-9]/g, '').length === 0;
     return isDkPrefixed || isDigitsOnly;
   });
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolCommonR042 = schematronRule(rule, evaluatePeppolCommonR042);

package/src/schematron/peppol/common/peppol-common-r043.ts

@@ -1,10 +1,9 @@
-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 { isValidMod97_0208 } from '#/peppol-validations/is-valid-mod97-0208';
 import { normalizeSpace } from '#/peppol-validations/normalize-space';
-import { getIdentifiersWithSchemeId, schematronResult } from '#/schematron/helpers';
+import { getIdentifiersWithSchemeId, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-COMMON-R043',
@@ -14,8 +13,10 @@ const rule = {
 
 const SCHEME_ID = '0208';
 
-export function validatePeppolCommonR043(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolCommonR043(document: PeppolDocument): boolean {
   const identifiers = getIdentifiersWithSchemeId(document).filter(i => i.schemeId === SCHEME_ID);
   const passed = identifiers.every(i => /^[0-9]{10}$/.test(normalizeSpace(i.id)) && isValidMod97_0208(normalizeSpace(i.id)).success);
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolCommonR043 = schematronRule(rule, evaluatePeppolCommonR043);

package/src/schematron/peppol/common/peppol-common-r044.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 { getIdentifiersWithSchemeId, schematronResult } from '#/schematron/helpers';
+import { getIdentifiersWithSchemeId, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-COMMON-R044',
@@ -13,8 +12,10 @@ const rule = {
 const SCHEME_ID = '0201';
 const ALLOWED_CHARACTERS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
 
-export function validatePeppolCommonR044(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolCommonR044(document: PeppolDocument): boolean {
   const identifiers = getIdentifiersWithSchemeId(document).filter(i => i.schemeId === SCHEME_ID);
   const passed = identifiers.every(i => i.id.length === 6 && i.id.split('').every(c => ALLOWED_CHARACTERS.includes(c)));
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolCommonR044 = schematronRule(rule, evaluatePeppolCommonR044);

package/src/schematron/peppol/common/peppol-common-r045.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 { checkCF } from '#/peppol-validations/check-cf';
-import { getIdentifiersWithSchemeId, schematronResult } from '#/schematron/helpers';
+import { getIdentifiersWithSchemeId, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-COMMON-R045',
@@ -13,8 +12,10 @@ const rule = {
 
 const SCHEME_ID = '0210';
 
-export function validatePeppolCommonR045(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolCommonR045(document: PeppolDocument): boolean {
   const identifiers = getIdentifiersWithSchemeId(document).filter(i => i.schemeId === SCHEME_ID);
   const passed = identifiers.every(i => checkCF(i.id));
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolCommonR045 = schematronRule(rule, evaluatePeppolCommonR045);

package/src/schematron/peppol/common/peppol-common-r046.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 { checkCF } from '#/peppol-validations/check-cf';
-import { getIdentifiersWithSchemeId, schematronResult } from '#/schematron/helpers';
+import { getIdentifiersWithSchemeId, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-COMMON-R046',
@@ -13,8 +12,10 @@ const rule = {
 
 const SCHEME_ID = '9907';
 
-export function validatePeppolCommonR046(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolCommonR046(document: PeppolDocument): boolean {
   const identifiers = getIdentifiersWithSchemeId(document).filter(i => i.schemeId === SCHEME_ID);
   const passed = identifiers.every(i => checkCF(i.id));
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolCommonR046 = schematronRule(rule, evaluatePeppolCommonR046);

package/src/schematron/peppol/common/peppol-common-r047.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 { checkPIVAseIT } from '#/peppol-validations/check-piva-se-it';
-import { getIdentifiersWithSchemeId, schematronResult } from '#/schematron/helpers';
+import { getIdentifiersWithSchemeId, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-COMMON-R047',
@@ -13,8 +12,10 @@ const rule = {
 
 const SCHEME_ID = '0211';
 
-export function validatePeppolCommonR047(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolCommonR047(document: PeppolDocument): boolean {
   const identifiers = getIdentifiersWithSchemeId(document).filter(i => i.schemeId === SCHEME_ID);
   const passed = identifiers.every(i => checkPIVAseIT(i.id));
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolCommonR047 = schematronRule(rule, evaluatePeppolCommonR047);

package/src/schematron/peppol/common/peppol-common-r049.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 { checkSEOrgnr } from '#/peppol-validations/check-se-orgnr';
-import { getIdentifiersWithSchemeId, schematronResult } from '#/schematron/helpers';
+import { getIdentifiersWithSchemeId, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-COMMON-R049',
@@ -13,8 +12,10 @@ const rule = {
 
 const SCHEME_ID = '0007';
 
-export function validatePeppolCommonR049(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolCommonR049(document: PeppolDocument): boolean {
   const identifiers = getIdentifiersWithSchemeId(document).filter(i => i.schemeId === SCHEME_ID);
   const passed = identifiers.every(i => i.id.trim().length === 10 && Number.isFinite(Number(i.id.trim())) && checkSEOrgnr(i.id));
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolCommonR049 = schematronRule(rule, evaluatePeppolCommonR049);

package/src/schematron/peppol/common/peppol-common-r050.ts

@@ -1,10 +1,9 @@
-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 { isValidABN } from '#/peppol-validations/is-valid-abn';
 import { normalizeSpace } from '#/peppol-validations/normalize-space';
-import { getIdentifiersWithSchemeId, schematronResult } from '#/schematron/helpers';
+import { getIdentifiersWithSchemeId, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-COMMON-R050',
@@ -14,8 +13,10 @@ const rule = {
 
 const SCHEME_ID = '0151';
 
-export function validatePeppolCommonR050(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolCommonR050(document: PeppolDocument): boolean {
   const identifiers = getIdentifiersWithSchemeId(document).filter(i => i.schemeId === SCHEME_ID);
   const passed = identifiers.every(i => /^[0-9]{11}$/.test(normalizeSpace(i.id)) && isValidABN(normalizeSpace(i.id)));
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolCommonR050 = schematronRule(rule, evaluatePeppolCommonR050);

package/src/schematron/peppol/common/peppol-common-r052.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 { getIdentifiersWithSchemeId, schematronResult } from '#/schematron/helpers';
+import { getIdentifiersWithSchemeId, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-COMMON-R052',
@@ -12,8 +11,10 @@ const rule = {
 
 const SCHEME_ID = '0096';
 
-export function validatePeppolCommonR052(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolCommonR052(document: PeppolDocument): boolean {
   const identifiers = getIdentifiersWithSchemeId(document).filter(i => i.schemeId === SCHEME_ID);
   const passed = identifiers.every(i => i.id.length === 10 && i.id.replace(/[0-9]/g, '').length === 0);
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolCommonR052 = schematronRule(rule, evaluatePeppolCommonR052);

package/src/schematron/peppol/common/peppol-common-r053.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 { getIdentifiersWithSchemeId, schematronResult } from '#/schematron/helpers';
+import { getIdentifiersWithSchemeId, schematronRule } from '#/schematron/helpers';
 
 const rule = {
   id: 'PEPPOL-COMMON-R053',
@@ -12,8 +11,10 @@ const rule = {
 
 const SCHEME_ID = '0198';
 
-export function validatePeppolCommonR053(document: PeppolDocument): SchematronRuleResult {
+function evaluatePeppolCommonR053(document: PeppolDocument): boolean {
   const identifiers = getIdentifiersWithSchemeId(document).filter(i => i.schemeId === SCHEME_ID);
   const passed = identifiers.every(i => i.id.length === 10 && i.id.startsWith('DK') && i.id.slice(2).replace(/[0-9]/g, '').length === 0);
-  return schematronResult(rule, passed);
+  return passed;
 }
+
+export const validatePeppolCommonR053 = schematronRule(rule, evaluatePeppolCommonR053);