@endevops/peppol-schema 0.1.1-alpha.2 → 0.1.1-alpha.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/SchemaStore/schemastore/refs/heads/master/src/schemas/json/package.json",
   "name": "@endevops/peppol-schema",
-  "version": "0.1.1-alpha.2",
+  "version": "0.1.1-alpha.3",
   "description": "TypeScript Effect Schema models for PEPPOL BIS Billing 3.0 — decode, validate and encode Invoice, Credit Note, Invoice Response and Message Level Response XML, with generated code lists, Schematron rules and identifier validations",
   "keywords": [
     "bis-billing",

package/src/schemas/peppol-document-schema.ts

@@ -84,7 +84,6 @@ const encodeDocumentXml = Effect.fn('encode-peppol-document-xml')(function* (val
     content = yield* encodeInvoiceResponse(value as never);
   } else {
     const rootNodes = Object.keys(value);
-    console.log(value, isPeppolInvoice(value), isPeppolCreditNote(value), isPeppolMessageLevelResponse(value), isPeppolInvoiceResponse(value));
     return yield* Effect.fail(
       new SchemaIssue.InvalidValue({ message: `Unsupported document type: ${value.profileId}\n${rootNodes.join(',')}` }, value, options)
     );

package/src/schemas/utils/peppol-xsd-time-schema.ts

@@ -1,4 +1,4 @@
-import { Clock, Option, DateTime, Effect, Predicate, Schema, SchemaGetter, SchemaIssue, SchemaParser } from 'effect';
+import { Clock, Option, DateTime, Effect, Predicate, Schema, SchemaGetter, SchemaIssue } from 'effect';
 
 import { formatXsdTime } from '#/schemas/utils/format-xsd-time.ts';
 import { opaque } from '#/schemas/utils/opaque.ts';
@@ -6,12 +6,13 @@ import { opaque } from '#/schemas/utils/opaque.ts';
 const timeRegex =
   /^(?<hours>[01]\d|2[0-3]):(?<minutes>[0-5]\d):(?<seconds>[0-5]\d)(?<nanoseconds>\.\d{1,9})?(?<tz>(?:Z|-0[1-9]|-1\d|-2[0-3]|-00:?(?:0[1-9]|[1-5]\d)|\+[01]\d|\+2[0-3])?(?:|:?[0-5]\d))$/;
 const timeZoneRegex = /^(?:(?<utc>Z)|[-+](?<hours>0[1-9]|1\d|2[0-3]|00):?(?<minutes>[0-5]\d))$/;
-const numberFromString = SchemaParser.decodeSync(
-  Schema.UndefinedOr(Schema.String.pipe(Schema.withDecodingDefault(Effect.succeed('0')))).pipe(
-    Schema.decodeTo(Schema.Number, { encode: SchemaGetter.String(), decode: SchemaGetter.Number() }),
-    Schema.catchDecoding(() => Effect.succeedSome(0))
-  )
-);
+const numberFromString = (value: string | undefined): number => {
+  if (value === undefined) {
+    return 0;
+  }
+  const parsed = Number(value);
+  return Number.isFinite(parsed) ? parsed : 0;
+};
 
 /**
  * @description Parse a timezone offset from a string. The string must be in the format `(+|-)HH:MM` where `HH` and `MM` are two digits.

package/src/schematron/gr/gr-r-001-3.ts

@@ -1,9 +1,8 @@
-import { Schema } from 'effect';
+import { DateTime } from 'effect';
 
 import type { PeppolDocument } from '#/schemas/peppol-document-schema.ts';
 import type { SchematronRule } from '#/schematron/helpers.ts';
 
-import { PeppolIsoDateString } from '#/schemas/peppol-iso-date-string.ts';
 import { getSupplierCountry, schematronRule } from '#/schematron/helpers.ts';
 
 const rule = {
@@ -13,7 +12,15 @@ const rule = {
 } as const satisfies SchematronRule;
 
 const DATE_REGEX = /^(0?[1-9]|[12][0-9]|3[01])[-/]?(0?[1-9]|1[0-2])[-/]?((?:19|20)[0-9]{2})$/;
-const encodeDateSync = Schema.encodeSync(PeppolIsoDateString);
+const formatIssueDate = (value: unknown): string => {
+  if (typeof value === 'string') {
+    return value;
+  }
+  if (DateTime.isDateTime(value)) {
+    return DateTime.formatIsoDate(value);
+  }
+  return String(value);
+};
 
 function evaluateGrR001_3(document: PeppolDocument): boolean {
   if (getSupplierCountry(document) !== 'GR' && getSupplierCountry(document) !== 'EL') {
@@ -29,7 +36,7 @@ function evaluateGrR001_3(document: PeppolDocument): boolean {
     return false;
   }
   const [, day, month, year] = dateMatch;
-  const issueDate = encodeDateSync(document.issueDate);
+  const issueDate = formatIssueDate(document.issueDate);
   const issueDateSegments = issueDate.split('-');
   return day === issueDateSegments[2] && month === issueDateSegments[1] && year === issueDateSegments[0];
 }

package/src/schematron/peppol/f/peppol-en16931-f001.ts

@@ -1,4 +1,4 @@
-import { Predicate, Schema } from 'effect';
+import { DateTime, Predicate, Schema } from 'effect';
 
 import type { PeppolDocument } from '#/schemas/peppol-document-schema.ts';
 import type { SchematronRule } from '#/schematron/helpers.ts';
@@ -12,7 +12,12 @@ const DATE_REGEX = /^\d{4}-\d{2}-\d{2}$/;
 
 const isValidDate = (value: string | undefined): boolean => value === undefined || (DATE_REGEX.test(value) && !Number.isNaN(Date.parse(value)));
 
-const encodeDateSync = Schema.encodeSync(Schema.Union([PeppolIsoDateString, Schema.String]));
+const formatDate = (value: PeppolIsoDateString | string): string => {
+  if (typeof value === 'string') {
+    return value;
+  }
+  return DateTime.formatIsoDate(value);
+};
 const isDate = Schema.is(PeppolIsoDateString);
 
 const collectDates = (document: PeppolDocument): Array<string> => {
@@ -24,9 +29,9 @@ const collectDates = (document: PeppolDocument): Array<string> => {
     ...getLines(document).flatMap(line => [line.invoicePeriod?.startDate, line.invoicePeriod?.endDate]),
   ].filter((date): date is string => date !== undefined);
 
-  const dates = [document.issueDate, ...optionalDates].map(date => encodeDateSync(date));
+  const dates = [document.issueDate, ...optionalDates].map(date => formatDate(date));
   if (Predicate.hasProperty(document, 'dueDate') && isDate(document.dueDate)) {
-    dates.push(encodeDateSync(document.dueDate));
+    dates.push(formatDate(document.dueDate));
   }
   return dates;
 };