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

package/src/schematron/helpers.ts

@@ -1,10 +1,11 @@
-import type * as z from 'zod/mini';
+import { Effect } from 'effect';
 
-import type { PeppolDocument, PeppolDocumentLine } from '#/document';
-import type { invoicePeriodSchema } from '#/schemas/fields/invoice-period-schema';
-import type { taxSubtotalSchema } from '#/schemas/fields/tax-subtotal-schema';
-import type { SchematronRuleLevel, SchematronRuleResult } from '#/schematron/types';
+import type { PeppolInvoicePeriod } from '#/schemas/fields/peppol-invoice-period-schema';
+import type { PeppolTaxSubTotal } from '#/schemas/fields/peppol-tax-subtotal-schema';
+import type { PeppolDocument, PeppolDocumentLine } from '#/schemas/peppol-document-schema';
+import type { SchematronRuleLevel } from '#/schematron/types';
 
+import { SchematronRuleError } from '#/schematron/errors';
 import { chargeReasonCodesKeys } from '#/values/charge-reason-codes.generated';
 import { countryCodesKeys } from '#/values/country-code.generated';
 
@@ -20,10 +21,19 @@ export interface SchematronRule {
 }
 
 /**
- * @description Builds a `SchematronRuleResult` for the given rule.
+ * @description An effectful schematron rule validator. Fails with a `SchematronRuleError` when the document does not satisfy the rule.
  */
-export function schematronResult(rule: SchematronRule, passed: boolean): SchematronRuleResult {
-  return { id: rule.id, level: rule.level, message: rule.message, passed };
+export type SchematronDocumentValidator = (document: PeppolDocument) => Effect.Effect<void, SchematronRuleError>;
+
+/**
+ * @description Builds an effectful validator from rule metadata and a pure predicate.
+ */
+export function schematronRule(rule: SchematronRule, predicate: (document: PeppolDocument) => boolean): SchematronDocumentValidator {
+  return Effect.fn(`schematron.${rule.id}`)(function* (document: PeppolDocument) {
+    if (!predicate(document)) {
+      return yield* new SchematronRuleError({ id: rule.id, level: rule.level, message: rule.message });
+    }
+  });
 }
 
 /**
@@ -99,6 +109,21 @@ export function isCustomerGermany(document: PeppolDocument): boolean {
   return document.accountingCustomerParty.postalAddress.countryCode.identificationCode.toUpperCase() === 'DE';
 }
 
+/**
+ * @description Whether both the supplier and customer countries are Denmark, mirroring the schematron `$supplierCountryIsDK` and `$customerCountryIsDK` variables.
+ */
+export function isDanishSupplierAndCustomer(document: PeppolDocument): boolean {
+  return getSupplierCountry(document) === 'DK' && getCustomerCountry(document) === 'DK';
+}
+
+/**
+ * @description Whether both the supplier and customer postal address countries are Germany, mirroring the schematron `$supplierCountryIsDE` and
+ * `$customerCountryIsDE` variables.
+ */
+export function isGermanSupplierAndCustomer(document: PeppolDocument): boolean {
+  return isSupplierGermany(document) && isCustomerGermany(document);
+}
+
 /**
  * @description Returns the invoice lines or credit note lines of a document.
  */
@@ -436,7 +461,7 @@ export function allVatCompanyIdsHaveValidPrefix(document: PeppolDocument): boole
  * @description Whether every invoice period / line period has an end date after or equal to its start date, used by BR-29 and BR-30.
  */
 export function everyPeriodEndAfterStart(document: PeppolDocument): boolean {
-  const ok = (period: z.infer<typeof invoicePeriodSchema> | undefined): boolean => {
+  const ok = (period: PeppolInvoicePeriod | undefined): boolean => {
     if (!period?.startDate || !period.endDate) {
       return true;
     }
@@ -450,7 +475,7 @@ export function everyPeriodEndAfterStart(document: PeppolDocument): boolean {
  * @description Whether every invoice period has a start/end date or a description code, used by BR-CO-19 and BR-CO-20.
  */
 export function everyPeriodHasDateOrDescriptionCode(document: PeppolDocument): boolean {
-  const ok = (period: z.infer<typeof invoicePeriodSchema> | undefined): boolean => {
+  const ok = (period: PeppolInvoicePeriod | undefined): boolean => {
     if (!period) {
       return true;
     }
@@ -500,7 +525,7 @@ export function withinSlackOne(a: number, b: number): boolean {
  * @description Whether the VAT category tax amount (BT-117) equals the VAT category taxable amount (BT-116) multiplied by the VAT category rate (BT-119), allowing
  * for a slack of 1, mirroring BR-CO-17.
  */
-export function vatCategoryTaxAmountMatchesRate(subtotal: z.infer<typeof taxSubtotalSchema>): boolean {
+export function vatCategoryTaxAmountMatchesRate(subtotal: PeppolTaxSubTotal): boolean {
   const percent = subtotal.taxCategory.percent;
   if (percent === undefined) {
     return Math.round(subtotal.taxAmount.value) === 0;
@@ -541,19 +566,17 @@ export function everyVatBreakdownTaxableMatchesRateSum(document: PeppolDocument)
  * @description Returns all identifiers carrying a scheme identifier, used by the PEPPOL-COMMON-R* rules.
  */
 export function getIdentifiersWithSchemeId(document: PeppolDocument): Array<{ id: string; schemeId: string }> {
-  const result: Array<{ id: string; schemeId: string }> = [];
-  const push = (id: string | undefined, schemeId: string | undefined) => {
-    if (id && schemeId) {
-      result.push({ id, schemeId });
-    }
-  };
+  const candidates: Array<{ id: string | undefined; schemeId: string | undefined }> = [];
   for (const party of [document.accountingSupplierParty, document.accountingCustomerParty]) {
-    push(party.endpointId?.id, party.endpointId?.schemeId);
-    push(party.partyIdentification?.id?.id, party.partyIdentification?.id?.schemeId);
-    push(party.partyLegalEntity.companyId?.id, party.partyLegalEntity.companyId?.schemeId);
+    candidates.push(
+      { id: party.endpointId?.id, schemeId: party.endpointId?.schemeId },
+      { id: party.partyIdentification?.id?.id, schemeId: party.partyIdentification?.id?.schemeId },
+      { id: party.partyLegalEntity.companyId?.id, schemeId: party.partyLegalEntity.companyId?.schemeId }
+    );
   }
-  if (document.payeeParty?.partyIdentification?.id) {
-    push(document.payeeParty.partyIdentification.id.id, document.payeeParty.partyIdentification.id.schemeId);
+  const payeeIdentification = document.payeeParty?.partyIdentification?.id;
+  if (payeeIdentification) {
+    candidates.push({ id: payeeIdentification.id, schemeId: payeeIdentification.schemeId });
   }
-  return result;
+  return candidates.filter((candidate): candidate is { id: string; schemeId: string } => Boolean(candidate.id) && Boolean(candidate.schemeId));
 }

package/src/schematron/index.ts

@@ -263,7 +263,6 @@ export { validateGrR009 } from './gr/gr-r-009';
 export { validateGrR010 } from './gr/gr-r-010';
 export { validateGrS008_1 } from './gr/gr-s-008-1';
 export { validateGrS011 } from './gr/gr-s-011';
-export {} from './index';
 export { validateIsR001 } from './is/is-r-001';
 export { validateIsR002 } from './is/is-r-002';
 export { validateIsR003 } from './is/is-r-003';
@@ -360,4 +359,10 @@ export { validateSeR011 } from './se/se-r-011';
 export { validateSeR012 } from './se/se-r-012';
 export { validateSeR013 } from './se/se-r-013';
 
+export { SchematronRuleError, SchematronValidationError } from './errors';
+export type { SchematronDocumentValidator } from './helpers';
+export { ruleValidators } from './run-all-rules';
+export { Schematron } from './schematron';
+export type { SchematronShape } from './schematron';
+
 export type * from './types';

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