@endevops/peppol-schema 0.1.0-beta.2 → 0.1.0-beta.3

package/src/decoders/fields/encode-price-allowance-charges.ts

@@ -1,15 +1,17 @@
+import { Effect, Predicate } from 'effect';
+
 import type { PeppolLinePriceAllowanceCharge } from '#/schemas/fields/line-price-allowance-charge-schema';
 
 import { encodeAmount } from '#/decoders/fields/encode-amount';
 
-export function encodePriceAllowanceCharges(allowanceCharge: PeppolLinePriceAllowanceCharge | undefined) {
-  if (!allowanceCharge) {
+export const encodePriceAllowanceCharges = Effect.fn(function* (allowanceCharge: PeppolLinePriceAllowanceCharge | undefined) {
+  if (Predicate.isNullish(allowanceCharge)) {
     return undefined;
   }
 
   return {
     'cbc:ChargeIndicator': allowanceCharge.chargeIndicator,
-    'cbc:Amount': encodeAmount(allowanceCharge.amount),
-    'cbc:BaseAmount': encodeAmount(allowanceCharge.baseAmount),
+    'cbc:Amount': yield* encodeAmount(allowanceCharge.amount),
+    'cbc:BaseAmount': yield* encodeAmount(allowanceCharge.baseAmount),
   };
-}
+});

package/src/decoders/fields/encode-quantity.ts

@@ -1,6 +1,8 @@
+import { Effect, Predicate } from 'effect';
+
 import type { PeppolQuantity } from '#/schemas/fields/quantity-schema';
 
-export function encodeQuantity(quantity?: PeppolQuantity) {
-  if (!quantity) return undefined;
+export const encodeQuantity = Effect.fn(function* (quantity?: PeppolQuantity) {
+  if (Predicate.isNullish(quantity)) return undefined;
   return { '#text': quantity.value, '@unitCode': quantity.unitCode };
-}
+});

package/src/decoders/fields/encode-simple-identifier.ts

@@ -1,11 +1,15 @@
+import { Effect, Predicate } from 'effect';
+
 type Exact<TExpected, TActual extends TExpected> = keyof TExpected extends keyof TActual
   ? keyof TActual extends keyof TExpected
     ? TActual
     : never
   : never;
 
-export function encodeSimpleIdentifier<const T extends { id: string } = { id: string }>(identifier: Exact<{ id: string }, T> | undefined) {
-  if (!identifier) return undefined;
+export const encodeSimpleIdentifier = Effect.fn(function* <const T extends { id: string } = { id: string }>(
+  identifier: Exact<{ id: string }, T> | undefined
+) {
+  if (Predicate.isNullish(identifier)) return undefined;
 
   return { 'cbc:ID': identifier.id };
-}
+});

package/src/decoders/fields/encode-tax-category.ts

@@ -1,10 +1,12 @@
+import { Effect, Predicate } from 'effect';
+
 import type { PeppolAllowanceCharge } from '#/schemas/fields/allowance-charge-schema';
 
 import { encodeSimpleIdentifier } from '#/decoders/fields/encode-simple-identifier';
 
-export function encodeTaxCategory(taxCategory: PeppolAllowanceCharge['taxCategory']) {
-  if (!taxCategory) {
+export const encodeTaxCategory = Effect.fn(function* (taxCategory: PeppolAllowanceCharge['taxCategory']) {
+  if (Predicate.isNullish(taxCategory)) {
     return undefined;
   }
-  return { 'cbc:ID': taxCategory.id, 'cbc:Percent': taxCategory.percent, 'cac:TaxScheme': encodeSimpleIdentifier(taxCategory.taxSchemeId) };
-}
+  return { 'cbc:ID': taxCategory.id, 'cbc:Percent': taxCategory.percent, 'cac:TaxScheme': yield* encodeSimpleIdentifier(taxCategory.taxSchemeId) };
+});

package/src/decoders/fields/encode-tax-representative-party.ts

@@ -1,16 +1,20 @@
+import { Effect, Predicate } from 'effect';
+
 import type { XmlNode } from '#/helpers/get-prop';
 import type { PeppolTaxRepresentativeParty } from '#/schemas/fields/tax-representative-party-schema';
 
 import { encodeAddress } from '#/decoders/fields/encode-address';
 import { encodePartyTaxScheme } from '#/decoders/fields/encode-party-tax-scheme';
 
-export function encodeTaxRepresentativeParty(taxRepresentativeParty: PeppolTaxRepresentativeParty | undefined): XmlNode {
-  if (!taxRepresentativeParty) {
+export const encodeTaxRepresentativeParty = Effect.fn(function* (
+  taxRepresentativeParty: PeppolTaxRepresentativeParty | undefined
+): Effect.fn.Return<XmlNode> {
+  if (Predicate.isNullish(taxRepresentativeParty)) {
     return undefined;
   }
   return {
     'cac:PartyName': { 'cbc:Name': taxRepresentativeParty.name },
-    'cac:PostalAddress': encodeAddress(taxRepresentativeParty.postalAddress),
-    'cac:PartyTaxScheme': encodePartyTaxScheme(taxRepresentativeParty.partyTaxScheme),
+    'cac:PostalAddress': yield* encodeAddress(taxRepresentativeParty.postalAddress),
+    'cac:PartyTaxScheme': yield* encodePartyTaxScheme(taxRepresentativeParty.partyTaxScheme),
   };
-}
+});

package/src/decoders/fields/encode-tax-totals.ts

@@ -1,21 +1,37 @@
+import { Effect, Predicate } from 'effect';
+
+import type { PeppolTaxSubTotal } from '#/schemas/fields/tax-subtotal-schema';
 import type { PeppolTaxTotal } from '#/schemas/fields/tax-totals';
 
 import { encodeAmount } from '#/decoders/fields/encode-amount';
 import { encodeSimpleIdentifier } from '#/decoders/fields/encode-simple-identifier';
 
-export function encodeTaxTotals(taxTotals: Array<PeppolTaxTotal>) {
-  return taxTotals.map(taxTotal => ({
-    'cbc:TaxAmount': encodeAmount(taxTotal.taxAmount),
-    'cac:TaxSubtotal': taxTotal.taxSubtotals?.map(taxSubTotal => ({
-      'cbc:TaxableAmount': encodeAmount(taxSubTotal.taxableAmount),
-      'cbc:TaxAmount': encodeAmount(taxSubTotal.taxAmount),
-      'cac:TaxCategory': {
-        'cbc:ID': taxSubTotal.taxCategory.id,
-        'cbc:Percent': taxSubTotal.taxCategory.percent,
-        'cbc:TaxExemptionReasonCode': taxSubTotal.taxCategory.taxExemptionReasonCode,
-        'cbc:TaxExemptionReason': taxSubTotal.taxCategory.taxExemptionReason,
-        'cac:TaxScheme': encodeSimpleIdentifier(taxSubTotal.taxCategory.taxSchemeId),
-      },
-    })),
-  }));
-}
+export const encodeTaxTotals = Effect.fn(function* (taxTotals: Array<PeppolTaxTotal>) {
+  return yield* Effect.forEach(
+    taxTotals,
+    Effect.fn(function* (taxTotal: PeppolTaxTotal) {
+      return { 'cbc:TaxAmount': yield* encodeAmount(taxTotal.taxAmount), 'cac:TaxSubtotal': yield* encodeTaxSubtotals(taxTotal.taxSubtotals) };
+    })
+  );
+});
+
+const encodeTaxSubtotals = Effect.fn(function* (taxSubtotals: Array<PeppolTaxSubTotal> | undefined) {
+  if (Predicate.isNullish(taxSubtotals)) return undefined;
+
+  return yield* Effect.forEach(
+    taxSubtotals,
+    Effect.fn(function* (taxSubTotal: PeppolTaxSubTotal) {
+      return {
+        'cbc:TaxableAmount': yield* encodeAmount(taxSubTotal.taxableAmount),
+        'cbc:TaxAmount': yield* encodeAmount(taxSubTotal.taxAmount),
+        'cac:TaxCategory': {
+          'cbc:ID': taxSubTotal.taxCategory.id,
+          'cbc:Percent': taxSubTotal.taxCategory.percent,
+          'cbc:TaxExemptionReasonCode': taxSubTotal.taxCategory.taxExemptionReasonCode,
+          'cbc:TaxExemptionReason': taxSubTotal.taxCategory.taxExemptionReason,
+          'cac:TaxScheme': yield* encodeSimpleIdentifier(taxSubTotal.taxCategory.taxSchemeId),
+        },
+      };
+    })
+  );
+});

package/src/document-parser.ts

@@ -1,3 +1,4 @@
+import { Effect } from 'effect';
 import XMLBuilder from 'fast-xml-builder';
 import { XMLParser } from 'fast-xml-parser';
 import * as z from 'zod/mini';
@@ -15,6 +16,7 @@ import { encodeCreditNote } from '#/decoders/encode-credit-note';
 import { encodeInvoice } from '#/decoders/encode-invoice';
 import { encodeInvoiceResponse } from '#/decoders/encode-invoice-response';
 import { encodeMessageLevelResponse } from '#/decoders/encode-message-level-response';
+import { PeppolDecodeError } from '#/decoders/errors';
 import { strOrUnd } from '#/helpers/str-or-und';
 import { creditNoteSchema } from '#/schemas/credit-note';
 import { invoiceSchema } from '#/schemas/invoice';
@@ -23,6 +25,9 @@ import { messageLevelResponse } from '#/schemas/message-level-response-schema';
 import { builderOptions } from '#/xml/builder-options';
 import { parserOptions } from '#/xml/parser-options';
 
+/**
+ * @deprecated use `PeppolDocumentParser` instead
+ */
 export const documentParser = z.codec(
   z.string(),
   z.xor([invoiceSchema, creditNoteSchema, messageLevelResponse, invoiceResponseSchema], 'invalid document'),
@@ -31,30 +36,30 @@ export const documentParser = z.codec(
       const parser = new XMLParser({ ...parserOptions, removeNSPrefix: true });
       const parsed = parser.parse(value);
       if (parsed.Invoice) {
-        return decodeInvoice(parsed);
+        return Effect.runSync(decodeInvoice(parsed));
       } else if (parsed.CreditNote) {
-        return decodeCreditNote(parsed);
+        return Effect.runSync(decodeCreditNote(parsed));
       } else if (parsed.ApplicationResponse) {
-        const profile = strOrUnd(parsed.ApplicationResponse, 'cbc:ProfileID');
+        const profile = Effect.runSync(strOrUnd(parsed.ApplicationResponse, 'cbc:ProfileID'));
         if (profile === MESSAGE_LEVEL_RESPONSE_PROFILE_ID) {
-          return decodeMessageLevelResponse(parsed);
+          return Effect.runSync(decodeMessageLevelResponse(parsed));
         } else if (profile === INVOICE_RESPONSE_PROFILE_ID) {
-          return decodeInvoiceResponse(parsed);
+          return Effect.runSync(decodeInvoiceResponse(parsed));
         }
       }
-      throw new Error(`Unsupported document type: ${Object.keys(parsed).join(',')}`);
+      throw new PeppolDecodeError({ message: `Unsupported document type: ${Object.keys(parsed).join(',')}` });
     },
     encode(value) {
       let content: unknown;
       if ('invoiceLines' in value) {
-        content = encodeInvoice(value as PeppolInvoice);
+        content = Effect.runSync(encodeInvoice(value as PeppolInvoice));
       } else if ('creditNoteLines' in value) {
-        content = encodeCreditNote(value as PeppolCreditNote);
+        content = Effect.runSync(encodeCreditNote(value as PeppolCreditNote));
       } else if ('documentResponse' in value) {
         if (value.profileId === MESSAGE_LEVEL_RESPONSE_PROFILE_ID) {
-          content = encodeMessageLevelResponse(value as PeppolMessageLevelResponse);
+          content = Effect.runSync(encodeMessageLevelResponse(value as PeppolMessageLevelResponse));
         } else if (value.profileId === INVOICE_RESPONSE_PROFILE_ID) {
-          content = encodeInvoiceResponse(value as PeppolInvoiceResponse);
+          content = Effect.runSync(encodeInvoiceResponse(value as PeppolInvoiceResponse));
         }
       }
 

package/src/effect/fields/peppol-additional-document-reference-schema.ts

@@ -1,10 +1,9 @@
 import { Schema } from 'effect';
 
+import { peppolBinaryObjectSchema } from '#/effect/fields/peppol-binary-object-schema';
+import { peppolIdentifierSchema } from '#/effect/fields/peppol-identifier-schema';
 import { additionalDocumentReferenceCodeSchema } from '#/effect/values/additional-document-reference-code-schema';
 
-import { identifierSchema } from './identifier-schema';
-import { peppolBinaryObjectSchema } from './peppol-binary-object-schema';
-
 /**
  * @description A group of business terms providing information about additional supporting documents substantiating the claims made in the Invoice. The additional
  * supporting documents can be used for both referencing a document number which is expected to be known by the receiver, an external document
@@ -14,7 +13,7 @@ import { peppolBinaryObjectSchema } from './peppol-binary-object-schema';
  *
  * @name `cac:AdditionalDocumentReference`
  */
-export const peppolAdditionalDocumentReferenceSchema = identifierSchema().pipe(
+export const peppolAdditionalDocumentReferenceSchema = peppolIdentifierSchema.pipe(
   Schema.fieldsAssign({
     /**
      * @description An identifier for an object on which the invoice is based (with DocumentTypeCode=130), given by the Seller, the identifier for the supporting
@@ -41,7 +40,7 @@ export const peppolAdditionalDocumentReferenceSchema = identifierSchema().pipe(
        *
        * @name `@schemeID`
        */
-      schemeId: Schema.optional(additionalDocumentReferenceCodeSchema()),
+      schemeId: Schema.optional(additionalDocumentReferenceCodeSchema),
     }),
     /**
      * @remarks

package/src/effect/fields/peppol-allowance-charge-schema.ts

@@ -1,12 +1,11 @@
 import { Effect, Schema } from 'effect';
 
+import { baseLineAllowanceChargeSchema } from '#/effect/fields/peppol-line-allowance-charge-schema';
+import { peppolTaxCategorySchema } from '#/effect/fields/peppol-tax-category-schema';
 import { allowanceChargeReasonCodeSchema } from '#/effect/values/allowance-charge-reason-code-schema';
 import { chargeReasonCodeSchema } from '#/effect/values/charge-reason-code-schema';
 import { dutyTaxFeeCategorySchema } from '#/effect/values/duty-tax-fee-category-schema';
 
-import { baseLineAllowanceChargeSchema } from './peppol-line-allowance-charge-schema';
-import { peppolTaxCategorySchema } from './peppol-tax-category-schema';
-
 const baseAllowanceChargeSchema = baseLineAllowanceChargeSchema.pipe(
   Schema.fieldsAssign({
     /**
@@ -24,7 +23,7 @@ const baseAllowanceChargeSchema = baseLineAllowanceChargeSchema.pipe(
            *
            * @name `cbc:ID`
            */
-          id: dutyTaxFeeCategorySchema(),
+          id: dutyTaxFeeCategorySchema,
           /**
            * @description The VAT rate, represented as percentage that applies to the document level allowance or charge.
            *
@@ -32,7 +31,7 @@ const baseAllowanceChargeSchema = baseLineAllowanceChargeSchema.pipe(
            *
            * @name `cbc:Percent`
            */
-          percent: Schema.optional(Schema.Number),
+          percent: Schema.optional(Schema.Finite),
           /**
            * @default VAT
            *
@@ -63,9 +62,7 @@ export const peppolAllowanceChargeSchema = Schema.Union([
       /**
        * @name cbc:AllowanceChargeReasonCode
        */
-      allowanceChargeReasonCode: Schema.optional(
-        allowanceChargeReasonCodeSchema('PEPPOL-EN16931-CL002: Reason code MUST be according to subset of UNCL 5189 D.16B.')
-      ),
+      allowanceChargeReasonCode: Schema.optional(allowanceChargeReasonCodeSchema),
       /**
        * @name cbc:ChargeIndicator
        *
@@ -81,7 +78,7 @@ export const peppolAllowanceChargeSchema = Schema.Union([
       /**
        * @name cbc:AllowanceChargeReasonCode
        */
-      allowanceChargeReasonCode: Schema.optional(chargeReasonCodeSchema('PEPPOL-EN16931-CL003: Reason code MUST be according to UNCL 7161 D.16B.')),
+      allowanceChargeReasonCode: Schema.optional(chargeReasonCodeSchema),
       /**
        * @name cbc:ChargeIndicator
        *

package/src/effect/fields/peppol-amount-schema.ts

@@ -11,11 +11,11 @@ export const peppolAmountSchema = Schema.Struct({
   /**
    * @name \@currencyID
    */
-  currencyId: currencyCodeSchema(),
+  currencyId: currencyCodeSchema,
   /**
    * @name #text (value)
    */
-  value: Schema.Number,
+  value: Schema.Finite,
 });
 
 export type PeppolAmount = typeof peppolAmountSchema.Type;

package/src/effect/fields/peppol-base-line-schema.ts

@@ -1,11 +1,11 @@
 import { Effect, Schema } from 'effect';
 
-import { identifierSchema } from './identifier-schema';
-import { peppolAmountSchema } from './peppol-amount-schema';
-import { peppolInvoiceLinePeriodSchema } from './peppol-invoice-line-period-schema';
-import { peppolLineAllowanceChargeSchema } from './peppol-line-allowance-charge-schema';
-import { peppolLineItemSchema } from './peppol-line-item-schema';
-import { peppolLinePriceSchema } from './peppol-line-price-schema';
+import { peppolAmountSchema } from '#/effect/fields/peppol-amount-schema';
+import { peppolIdentifierSchema } from '#/effect/fields/peppol-identifier-schema';
+import { peppolInvoiceLinePeriodSchema } from '#/effect/fields/peppol-invoice-line-period-schema';
+import { peppolLineAllowanceChargeSchema } from '#/effect/fields/peppol-line-allowance-charge-schema';
+import { peppolLineItemSchema } from '#/effect/fields/peppol-line-item-schema';
+import { peppolLinePriceSchema } from '#/effect/fields/peppol-line-price-schema';
 
 /**
  * @description Base of the invoice line and credit note line schemas.
@@ -43,7 +43,7 @@ export const peppolBaseLineSchema = Schema.Struct({
    */
   documentReference: Schema.optional(
     Schema.Array(
-      identifierSchema().pipe(
+      peppolIdentifierSchema.pipe(
         Schema.fieldsAssign({
           /**
            * @default 130

package/src/effect/fields/peppol-binary-object-schema.ts

@@ -34,7 +34,7 @@ export const peppolBinaryObjectSchema = Schema.Struct({
    *
    * @name `@mimeCode`
    */
-  mimeCode: mimeCodesSchema('PEPPOL-EN16931-CL001: Mime code must be according to subset of IANA code list.'),
+  mimeCode: mimeCodesSchema,
   /**
    * @description The file name of the attached document.
    *

package/src/effect/fields/peppol-credit-note-line-schema.ts

@@ -1,10 +1,9 @@
 import { Schema } from 'effect';
 
+import { peppolBaseLineSchema } from '#/effect/fields/peppol-base-line-schema';
+import { peppolQuantitySchema } from '#/effect/fields/peppol-quantity-schema';
 import { quantityUnitCodesSchema } from '#/effect/values/quantity-unit-codes-schema';
 
-import { peppolBaseLineSchema } from './peppol-base-line-schema';
-import { peppolQuantitySchema } from './peppol-quantity-schema';
-
 /**
  * @description Credit note line is identical to Invoice line except the quantity element name.
  */
@@ -33,10 +32,10 @@ export const peppolCreditNoteLineSchema = peppolBaseLineSchema.pipe(
          *
          * @see {@link quantityUnitCodes}
          */
-        unitCode: quantityUnitCodesSchema(),
+        unitCode: quantityUnitCodesSchema,
       })
     ),
   })
 );
 
-export type PeppolCreditNoteLine = typeof peppolCreditNoteLineSchema.Type;
+export interface PeppolCreditNoteLine extends Schema.Schema.Type<typeof peppolCreditNoteLineSchema> {}

package/src/effect/fields/peppol-delivery-schema.ts

@@ -3,8 +3,8 @@ import { Schema } from 'effect';
 import { peppolIsoDateStringSchema } from '#/effect/peppol-iso-date-string-schema';
 import { icdCodesSchema } from '#/effect/values/icd-codes-schema';
 
-import { identifierSchema } from './identifier-schema';
 import { peppolAddressSchema } from './peppol-address-schema';
+import { peppolIdentifierSchema } from './peppol-identifier-schema';
 
 export const peppolDeliverySchema = Schema.Struct({
   /**
@@ -36,7 +36,7 @@ export const peppolDeliverySchema = Schema.Struct({
        * @name `cbc:ID`
        */
       id: Schema.optional(
-        identifierSchema().pipe(
+        peppolIdentifierSchema.pipe(
           Schema.fieldsAssign({
             /**
              * @description An identifier for the location at which the goods and services are delivered.
@@ -56,7 +56,7 @@ export const peppolDeliverySchema = Schema.Struct({
              *
              * @name `@schemeID`
              */
-            schemeId: Schema.optional(icdCodesSchema()),
+            schemeId: Schema.optional(icdCodesSchema),
           })
         )
       ),

package/src/effect/fields/{identifier-schema.ts → peppol-identifier-schema.ts}

@@ -1,6 +1,11 @@
 import { Schema } from 'effect';
 
-const identifierBase = Schema.Struct({
+/**
+ * @summary Identifier with optional scheme
+ *
+ * @name `cbc:ID (+ optional @schemeID)`
+ */
+export const peppolIdentifierSchema = Schema.Struct({
   /**
    * @name cbc:ID
    */
@@ -11,13 +16,4 @@ const identifierBase = Schema.Struct({
   schemeId: Schema.optional(Schema.String),
 });
 
-/**
- * @summary Identifier with optional scheme
- *
- * @name `cbc:ID (+ optional @schemeID)`
- */
-export function identifierSchema(error?: string) {
-  return error === undefined ? identifierBase : identifierBase.annotate({ message: error });
-}
-
-export type PeppolIdentifier = typeof identifierBase.Type;
+export type PeppolIdentifier = typeof peppolIdentifierSchema.Type;

package/src/effect/fields/peppol-invoice-line-schema.ts

@@ -1,10 +1,9 @@
 import { Schema } from 'effect';
 
+import { peppolBaseLineSchema } from '#/effect/fields/peppol-base-line-schema';
+import { peppolQuantitySchema } from '#/effect/fields/peppol-quantity-schema';
 import { quantityUnitCodesSchema } from '#/effect/values/quantity-unit-codes-schema';
 
-import { peppolBaseLineSchema } from './peppol-base-line-schema';
-import { peppolQuantitySchema } from './peppol-quantity-schema';
-
 /**
  * @summary Invoice line
  *
@@ -37,10 +36,10 @@ export const peppolInvoiceLineSchema = peppolBaseLineSchema.pipe(
          *
          * @see {@link quantityUnitCodes}
          */
-        unitCode: quantityUnitCodesSchema(),
+        unitCode: quantityUnitCodesSchema,
       })
     ),
   })
 );
 
-export type PeppolInvoiceLine = typeof peppolInvoiceLineSchema.Type;
+export interface PeppolInvoiceLine extends Schema.Schema.Type<typeof peppolInvoiceLineSchema> {}

package/src/effect/fields/peppol-invoice-period-schema.ts

@@ -1,9 +1,8 @@
 import { Schema } from 'effect';
 
+import { peppolInvoiceLinePeriodSchema } from '#/effect/fields/peppol-invoice-line-period-schema';
 import { vatDateCodeSchema } from '#/effect/values/vat-date-code-schema';
 
-import { peppolInvoiceLinePeriodSchema } from './peppol-invoice-line-period-schema';
-
 /**
  * @description A group of business terms providing information on the invoice period. Also called delivery period. If the group is used, the invoiceing period
  * start date and/or end date must be used.
@@ -24,7 +23,7 @@ export const peppolInvoicePeriodSchema = peppolInvoiceLinePeriodSchema.pipe(
      *
      * @name `cbc:DescriptionCode`
      */
-    descriptionCode: Schema.optional(vatDateCodeSchema()),
+    descriptionCode: Schema.optional(vatDateCodeSchema),
   })
 );
 

package/src/effect/fields/peppol-item-classification-schema.ts

@@ -28,7 +28,7 @@ export const peppolItemClassificationSchema = Schema.Struct({
    *
    * @name `@listID`
    */
-  listId: itemClassificationCodesSchema(),
+  listId: itemClassificationCodesSchema,
   /**
    * @description The identification scheme version identifier of the Item classification identifier.
    *

package/src/effect/fields/peppol-legal-monetary-total-schema.ts

@@ -1,6 +1,6 @@
 import { Schema } from 'effect';
 
-import { peppolAmountSchema } from './peppol-amount-schema';
+import { peppolAmountSchema } from '#/effect/fields/peppol-amount-schema';
 
 /**
  * @description A group of business terms providing the monetary totals for the Invoice.

package/src/effect/fields/peppol-line-allowance-charge-schema.ts

@@ -1,10 +1,9 @@
 import { Schema } from 'effect';
 
+import { priceAllowanceChargeSchema } from '#/effect/fields/peppol-line-price-allowance-charge-schema';
 import { allowanceChargeReasonCodeSchema } from '#/effect/values/allowance-charge-reason-code-schema';
 import { chargeReasonCodeSchema } from '#/effect/values/charge-reason-code-schema';
 
-import { priceAllowanceChargeSchema } from './peppol-line-price-allowance-charge-schema';
-
 const baseLineAllowanceChargeSchema = priceAllowanceChargeSchema.pipe(
   Schema.fieldsAssign({
     /**
@@ -20,7 +19,7 @@ const baseLineAllowanceChargeSchema = priceAllowanceChargeSchema.pipe(
      *
      * @name cbc:MultiplierFactorNumeric
      */
-    multiplierFactorNumeric: Schema.optional(Schema.Number),
+    multiplierFactorNumeric: Schema.optional(Schema.Finite),
   })
 );
 
@@ -30,9 +29,7 @@ export const peppolLineAllowanceChargeSchema = Schema.Union([
       /**
        * @name cbc:AllowanceChargeReasonCode
        */
-      allowanceChargeReasonCode: Schema.optional(
-        allowanceChargeReasonCodeSchema('PEPPOL-EN16931-CL002: Reason code MUST be according to subset of UNCL 5189 D.16B.')
-      ),
+      allowanceChargeReasonCode: Schema.optional(allowanceChargeReasonCodeSchema),
       /**
        * @name cbc:ChargeIndicator
        *
@@ -48,7 +45,7 @@ export const peppolLineAllowanceChargeSchema = Schema.Union([
       /**
        * @name cbc:AllowanceChargeReasonCode
        */
-      allowanceChargeReasonCode: Schema.optional(chargeReasonCodeSchema('PEPPOL-EN16931-CL003: Reason code MUST be according to UNCL 7161 D.16B.')),
+      allowanceChargeReasonCode: Schema.optional(chargeReasonCodeSchema),
       /**
        * @name cbc:ChargeIndicator
        *

package/src/effect/fields/peppol-line-item-schema.ts

@@ -1,12 +1,11 @@
 import { Schema } from 'effect';
 
+import { peppolIdentifierSchema } from '#/effect/fields/peppol-identifier-schema';
+import { peppolItemClassificationSchema } from '#/effect/fields/peppol-item-classification-schema';
+import { peppolTaxCategorySchema } from '#/effect/fields/peppol-tax-category-schema';
 import { icdCodesSchema } from '#/effect/values/icd-codes-schema';
 import { peppolCountryCodeSchema } from '#/effect/values/peppol-country-code-schema';
 
-import { identifierSchema } from './identifier-schema';
-import { peppolItemClassificationSchema } from './peppol-item-classification-schema';
-import { peppolTaxCategorySchema } from './peppol-tax-category-schema';
-
 /**
  * @summary Item details on invoice/credit-note line
  *
@@ -83,7 +82,7 @@ export const peppolLineItemSchema = Schema.Struct({
        *
        * @name `cbc:ID`
        */
-      id: identifierSchema().pipe(
+      id: peppolIdentifierSchema.pipe(
         Schema.fieldsAssign({
           /**
            * @description An item identifier based on a registered scheme.
@@ -100,7 +99,7 @@ export const peppolLineItemSchema = Schema.Struct({
            *
            * @name `@schemeID`
            */
-          schemeId: icdCodesSchema(),
+          schemeId: icdCodesSchema,
         })
       ),
     })

package/src/effect/fields/peppol-line-price-allowance-charge-schema.ts

@@ -1,6 +1,6 @@
 import { Schema } from 'effect';
 
-import { peppolAmountSchema } from './peppol-amount-schema';
+import { peppolAmountSchema } from '#/effect/fields/peppol-amount-schema';
 
 const priceAllowanceChargeSchema = Schema.Struct({
   /**

package/src/effect/fields/peppol-line-price-schema.ts

@@ -1,8 +1,8 @@
 import { Schema } from 'effect';
 
-import { peppolAmountSchema } from './peppol-amount-schema';
-import { peppolLinePriceAllowanceChargeSchema } from './peppol-line-price-allowance-charge-schema';
-import { peppolQuantitySchema } from './peppol-quantity-schema';
+import { peppolAmountSchema } from '#/effect/fields/peppol-amount-schema';
+import { peppolLinePriceAllowanceChargeSchema } from '#/effect/fields/peppol-line-price-allowance-charge-schema';
+import { peppolQuantitySchema } from '#/effect/fields/peppol-quantity-schema';
 
 /**
  * @summary Price details on invoice line