@fin.cx/einvoice 8.3.0 → 8.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/formats/cii/facturx/facturx.encoder.js +5 -3
- package/dist_ts/formats/cii/zugferd/zugferd.encoder.js +7 -7
- package/dist_ts/formats/ubl/generic/ubl.encoder.d.ts +0 -7
- package/dist_ts/formats/ubl/generic/ubl.encoder.js +9 -23
- package/dist_ts/formats/ubl/xrechnung/xrechnung.encoder.d.ts +0 -5
- package/dist_ts/formats/ubl/xrechnung/xrechnung.encoder.js +1 -23
- package/dist_ts/formats/utils/country.code.d.ts +15 -0
- package/dist_ts/formats/utils/country.code.js +41 -0
- package/dist_ts/formats/validation/codelist.validator.js +2 -2
- package/dist_ts/formats/validation/validation.types.js +23 -6
- package/package.json +2 -2
- package/readme.md +1 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/formats/cii/facturx/facturx.encoder.ts +4 -2
- package/ts/formats/cii/zugferd/zugferd.encoder.ts +6 -6
- package/ts/formats/ubl/generic/ubl.encoder.ts +13 -24
- package/ts/formats/ubl/xrechnung/xrechnung.encoder.ts +0 -23
- package/ts/formats/utils/country.code.ts +53 -0
- package/ts/formats/validation/codelist.validator.ts +2 -2
- package/ts/formats/validation/validation.types.ts +22 -5
|
@@ -76,8 +76,6 @@ export class XRechnungEncoder extends UBLEncoder {
|
|
|
76
76
|
paymentMeans.appendChild(paymentId);
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
|
-
// Add country code handling for German addresses
|
|
80
|
-
this.fixGermanCountryCodes(doc);
|
|
81
79
|
// Preserve business references from metadata
|
|
82
80
|
this.addBusinessReferences(doc, metadata?.businessReferences);
|
|
83
81
|
// Preserve payment information from metadata
|
|
@@ -183,26 +181,6 @@ export class XRechnungEncoder extends UBLEncoder {
|
|
|
183
181
|
}
|
|
184
182
|
}
|
|
185
183
|
}
|
|
186
|
-
/**
|
|
187
|
-
* Fixes German country codes in the document
|
|
188
|
-
* @param doc XML document
|
|
189
|
-
*/
|
|
190
|
-
fixGermanCountryCodes(doc) {
|
|
191
|
-
const countryNodes = doc.getElementsByTagName('cbc:IdentificationCode');
|
|
192
|
-
for (let i = 0; i < countryNodes.length; i++) {
|
|
193
|
-
const node = countryNodes[i];
|
|
194
|
-
if (node.textContent) {
|
|
195
|
-
const text = node.textContent.toLowerCase();
|
|
196
|
-
if (text === 'germany' || text === 'deutschland' || text === 'de') {
|
|
197
|
-
node.textContent = 'DE';
|
|
198
|
-
}
|
|
199
|
-
else if (text.length > 2) {
|
|
200
|
-
// Try to use first 2 characters as country code
|
|
201
|
-
node.textContent = text.substring(0, 2).toUpperCase();
|
|
202
|
-
}
|
|
203
|
-
}
|
|
204
|
-
}
|
|
205
|
-
}
|
|
206
184
|
/**
|
|
207
185
|
* Adds business references from metadata to the document
|
|
208
186
|
* @param doc XML document
|
|
@@ -563,4 +541,4 @@ export class XRechnungEncoder extends UBLEncoder {
|
|
|
563
541
|
}
|
|
564
542
|
}
|
|
565
543
|
}
|
|
566
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"xrechnung.encoder.js","sourceRoot":"","sources":["../../../../ts/formats/ubl/xrechnung/xrechnung.encoder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAExD;;;GAGG;AACH,MAAM,OAAO,gBAAiB,SAAQ,UAAU;IAC9C;;;;OAIG;IACO,KAAK,CAAC,gBAAgB,CAAC,UAAuB;QACtD,6BAA6B;QAC7B,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAEzD,iCAAiC;QACjC,MAAM,GAAG,GAAG,IAAI,SAAS,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;QACxE,IAAI,CAAC,4BAA4B,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAEnD,2BAA2B;QAC3B,OAAO,IAAI,aAAa,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;IACpD,CAAC;IAED;;;;OAIG;IACO,KAAK,CAAC,aAAa,CAAC,OAAyB;QACrD,6BAA6B;QAC7B,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAEnD,iCAAiC;QACjC,MAAM,GAAG,GAAG,IAAI,SAAS,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;QACxE,IAAI,CAAC,4BAA4B,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAEhD,2BAA2B;QAC3B,OAAO,IAAI,aAAa,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;IACpD,CAAC;IAED;;;;OAIG;IACK,4BAA4B,CAAC,GAAa,EAAE,OAAuB;QACzE,MAAM,IAAI,GAAG,GAAG,CAAC,eAAe,CAAC;QAEjC,gCAAgC;QAChC,MAAM,QAAQ,GAAI,OAAe,CAAC,QAAQ,EAAE,UAAU,CAAC;QAEvD,kDAAkD;QAClD,MAAM,eAAe,GAAG,IAAI,CAAC,oBAAoB,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5E,IAAI,eAAe,EAAE,CAAC;YACpB,eAAe,CAAC,WAAW,GAAG,qBAAqB,CAAC,SAAS,CAAC;QAChE,CAAC;QAED,yDAAyD;QACzD,IAAI,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC;QAClE,MAAM,mBAAmB,GAAI,OAAe,CAAC,cAAc,IAAI,QAAQ,EAAE,kBAAkB,EAAE,cAAc,IAAI,OAAO,CAAC,EAAE,CAAC;QAC1H,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,uDAAuD;YACvD,MAAM,YAAY,GAAG,IAAI,CAAC,oBAAoB,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9E,IAAI,YAAY,EAAE,CAAC;gBACjB,QAAQ,GAAG,GAAG,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;gBACnD,QAAQ,CAAC,WAAW,GAAG,mBAAmB,CAAC;gBAC3C,YAAY,CAAC,UAAW,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC;YAC5E,CAAC;QACH,CAAC;aAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,IAAI,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YACvE,QAAQ,CAAC,WAAW,GAAG,mBAAmB,CAAC;QAC7C,CAAC;QAED,kDAAkD;QAClD,IAAI,CAAC,2BAA2B,CAAC,GAAG,EAAE,6BAA6B,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACnF,IAAI,CAAC,2BAA2B,CAAC,GAAG,EAAE,6BAA6B,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QAEjF,kCAAkC;QAClC,MAAM,YAAY,GAAG,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;QACtE,IAAI,YAAY,EAAE,CAAC;YACjB,IAAI,SAAS,GAAG,YAAY,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;YACtE,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,SAAS,GAAG,GAAG,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;gBAC/C,SAAS,CAAC,WAAW,GAAG,OAAO,CAAC,EAAE,CAAC;gBACnC,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;YACtC,CAAC;QACH,CAAC;QAED,iDAAiD;QACjD,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;QAEhC,6CAA6C;QAC7C,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QAE9D,6CAA6C;QAC7C,IAAI,CAAC,yBAAyB,CAAC,GAAG,EAAE,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QAElE,0CAA0C;QAC1C,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC;QAExD,iDAAiD;QACjD,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAE3C,mCAAmC;QACnC,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAEpC,oFAAoF;QACpF,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED;;;;;OAKG;IACK,2BAA2B,CAAC,GAAa,EAAE,SAAiB,EAAE,KAAU;QAC9E,MAAM,cAAc,GAAG,GAAG,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9D,IAAI,CAAC,cAAc;YAAE,OAAO;QAE5B,MAAM,YAAY,GAAG,cAAc,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;QACzE,IAAI,CAAC,YAAY;YAAE,OAAO;QAE1B,6CAA6C;QAC7C,MAAM,gBAAgB,GAAG,YAAY,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;QAChF,IAAI,CAAC,gBAAgB,IAAI,KAAK,CAAC,iBAAiB,EAAE,CAAC;YACjD,2DAA2D;YAC3D,MAAM,YAAY,GAAG,GAAG,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;YACzD,YAAY,CAAC,YAAY,CAAC,UAAU,EAAE,KAAK,CAAC,iBAAiB,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC;YAChF,YAAY,CAAC,WAAW,GAAG,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC;YAEzD,yCAAyC;YACzC,IAAI,YAAY,CAAC,UAAU,EAAE,CAAC;gBAC5B,YAAY,CAAC,YAAY,CAAC,YAAY,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;YACnE,CAAC;iBAAM,CAAC;gBACN,YAAY,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;QAED,gDAAgD;QAChD,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACnC,MAAM,YAAY,GAAG,GAAG,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;YACzD,YAAY,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,gBAAgB;YAC/D,YAAY,CAAC,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC;YAErC,yCAAyC;YACzC,IAAI,YAAY,CAAC,UAAU,EAAE,CAAC;gBAC5B,YAAY,CAAC,YAAY,CAAC,YAAY,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;YACnE,CAAC;iBAAM,CAAC;gBACN,YAAY,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;QAED,qDAAqD;QACrD,IAAI,KAAK,CAAC,qBAAqB,EAAE,CAAC;YAChC,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,qBAAqB,EAAE,CAAC;gBACrD,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC,yBAAyB,CAAC,CAAC;gBAC7D,MAAM,EAAE,GAAG,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;gBACvC,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;oBACtB,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;gBACjD,CAAC;gBACD,EAAE,CAAC,WAAW,GAAG,UAAU,CAAC,KAAK,CAAC;gBAClC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;gBAExB,0CAA0C;gBAC1C,MAAM,QAAQ,GAAG,YAAY,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;gBACxE,IAAI,QAAQ,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;oBACrC,YAAY,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;gBAC3D,CAAC;qBAAM,IAAI,YAAY,CAAC,UAAU,EAAE,CAAC;oBACnC,YAAY,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;gBAC9D,CAAC;qBAAM,CAAC;oBACN,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;gBACpC,CAAC;YACH,CAAC;QACH,CAAC;QAED,sDAAsD;QACtD,IAAI,KAAK,CAAC,mBAAmB,EAAE,cAAc,EAAE,CAAC;YAC9C,IAAI,WAAW,GAAG,YAAY,CAAC,oBAAoB,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/E,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,WAAW,GAAG,GAAG,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC;gBACxD,6BAA6B;gBAC7B,MAAM,aAAa,GAAG,YAAY,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;gBAChF,IAAI,aAAa,IAAI,aAAa,CAAC,WAAW,EAAE,CAAC;oBAC/C,YAAY,CAAC,YAAY,CAAC,WAAW,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;gBACpE,CAAC;qBAAM,CAAC;oBACN,YAAY,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;gBACxC,CAAC;YACH,CAAC;YAED,uCAAuC;YACvC,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjE,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC;gBAC1D,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC,mBAAmB,CAAC,gBAAgB,IAAI,KAAK,CAAC,IAAI,CAAC;gBAC/E,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACnC,CAAC;YAED,gCAAgC;YAChC,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1D,MAAM,SAAS,GAAG,GAAG,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;gBACrD,SAAS,CAAC,WAAW,GAAG,KAAK,CAAC,mBAAmB,CAAC,cAAc,CAAC;gBACjE,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;YACrC,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,qBAAqB,CAAC,GAAa;QACzC,MAAM,YAAY,GAAG,GAAG,CAAC,oBAAoB,CAAC,wBAAwB,CAAC,CAAC;QACxE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7C,MAAM,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;YAC7B,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBACrB,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;gBAC5C,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,aAAa,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;oBAClE,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;gBAC1B,CAAC;qBAAM,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC3B,gDAAgD;oBAChD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;gBACxD,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;OAIG;IACK,qBAAqB,CAAC,GAAa,EAAE,kBAAwB;QACnE,IAAI,CAAC,kBAAkB;YAAE,OAAO;QAEhC,MAAM,IAAI,GAAG,GAAG,CAAC,eAAe,CAAC;QAEjC,qBAAqB;QACrB,IAAI,kBAAkB,CAAC,cAAc,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7F,MAAM,QAAQ,GAAG,GAAG,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;YACzD,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAC5C,OAAO,CAAC,WAAW,GAAG,kBAAkB,CAAC,cAAc,CAAC;YACxD,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAE9B,oCAAoC;YACpC,MAAM,YAAY,GAAG,IAAI,CAAC,oBAAoB,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9E,IAAI,YAAY,IAAI,YAAY,CAAC,UAAU,EAAE,CAAC;gBAC5C,YAAY,CAAC,UAAU,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC;YAC3E,CAAC;QACH,CAAC;QAED,gCAAgC;QAChC,IAAI,kBAAkB,CAAC,iBAAiB,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3G,MAAM,WAAW,GAAG,GAAG,CAAC,aAAa,CAAC,+BAA+B,CAAC,CAAC;YACvE,MAAM,UAAU,GAAG,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAC/C,UAAU,CAAC,WAAW,GAAG,kBAAkB,CAAC,iBAAiB,CAAC;YAC9D,WAAW,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;YAEpC,sDAAsD;YACtD,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC;YACpE,MAAM,WAAW,GAAG,QAAQ,IAAI,IAAI,CAAC,oBAAoB,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC;YACzF,IAAI,WAAW,IAAI,WAAW,CAAC,UAAU,EAAE,CAAC;gBAC1C,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,WAAW,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC;YAC5E,CAAC;QACH,CAAC;QAED,uBAAuB;QACvB,IAAI,kBAAkB,CAAC,gBAAgB,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACjG,MAAM,UAAU,GAAG,GAAG,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC;YAC7D,MAAM,SAAS,GAAG,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAC9C,SAAS,CAAC,WAAW,GAAG,kBAAkB,CAAC,gBAAgB,CAAC;YAC5D,UAAU,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;YAElC,uDAAuD;YACvD,MAAM,WAAW,GAAG,IAAI,CAAC,oBAAoB,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAC,CAAC;YAClF,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC;YACpE,MAAM,WAAW,GAAG,WAAW,IAAI,QAAQ,IAAI,IAAI,CAAC,oBAAoB,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC;YACxG,IAAI,WAAW,IAAI,WAAW,CAAC,UAAU,EAAE,CAAC;gBAC1C,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,UAAU,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC;YAC3E,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;OAIG;IACK,yBAAyB,CAAC,GAAa,EAAE,WAAiB;QAChE,IAAI,CAAC,WAAW;YAAE,OAAO;QAEzB,MAAM,IAAI,GAAG,GAAG,CAAC,eAAe,CAAC;QACjC,IAAI,YAAY,GAAG,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;QAEpE,0CAA0C;QAC1C,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,YAAY,GAAG,GAAG,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC;YACrD,yBAAyB;YACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9D,IAAI,QAAQ,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;gBACpC,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC;QAED,uBAAuB;QACvB,IAAI,WAAW,CAAC,gBAAgB,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAClG,MAAM,SAAS,GAAG,GAAG,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC;YAC5D,SAAS,CAAC,WAAW,GAAG,WAAW,CAAC,gBAAgB,CAAC;YACrD,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;QAED,gBAAgB;QAChB,IAAI,WAAW,CAAC,SAAS,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACpF,MAAM,SAAS,GAAG,GAAG,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;YACrD,SAAS,CAAC,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC;YAC9C,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;QAED,qBAAqB;QACrB,IAAI,WAAW,CAAC,cAAc,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9F,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;YACxD,OAAO,CAAC,WAAW,GAAG,WAAW,CAAC,cAAc,CAAC;YACjD,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QACpC,CAAC;QAED,mBAAmB;QACnB,IAAI,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,GAAG,EAAE,CAAC;YACxC,IAAI,YAAY,GAAG,YAAY,CAAC,oBAAoB,CAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC,CAAC;YACrF,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,YAAY,GAAG,GAAG,CAAC,aAAa,CAAC,2BAA2B,CAAC,CAAC;gBAC9D,YAAY,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YACzC,CAAC;YAED,WAAW;YACX,IAAI,WAAW,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACxE,MAAM,IAAI,GAAG,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;gBACzC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC;gBACpC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACjC,CAAC;YAED,8EAA8E;YAC9E,IAAI,WAAW,CAAC,WAAW,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjF,MAAM,WAAW,GAAG,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;gBAClD,WAAW,CAAC,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC;gBAClD,wDAAwD;gBACxD,MAAM,EAAE,GAAG,YAAY,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC1D,MAAM,aAAa,GAAG,YAAY,CAAC,oBAAoB,CAAC,gCAAgC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC7F,IAAI,aAAa,EAAE,CAAC;oBAClB,YAAY,CAAC,YAAY,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;gBACxD,CAAC;qBAAM,IAAI,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;oBAChC,YAAY,CAAC,YAAY,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC;gBACzD,CAAC;qBAAM,CAAC;oBACN,YAAY,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;gBACxC,CAAC;YACH,CAAC;YAED,wBAAwB;YACxB,IAAI,WAAW,CAAC,GAAG,IAAI,WAAW,CAAC,QAAQ,EAAE,CAAC;gBAC5C,IAAI,aAAa,GAAG,YAAY,CAAC,oBAAoB,CAAC,gCAAgC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC3F,IAAI,CAAC,aAAa,EAAE,CAAC;oBACnB,aAAa,GAAG,GAAG,CAAC,aAAa,CAAC,gCAAgC,CAAC,CAAC;oBACpE,YAAY,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;gBAC1C,CAAC;gBAED,uBAAuB;gBACvB,IAAI,WAAW,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBACxE,MAAM,UAAU,GAAG,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;oBAC/C,UAAU,CAAC,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC;oBACzC,aAAa,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;gBACxC,CAAC;gBAED,gBAAgB;gBAChB,IAAI,WAAW,CAAC,QAAQ,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC/E,MAAM,eAAe,GAAG,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;oBACtD,eAAe,CAAC,WAAW,GAAG,WAAW,CAAC,QAAQ,CAAC;oBACnD,aAAa,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;gBAC7C,CAAC;YACH,CAAC;QACH,CAAC;QAED,+CAA+C;QAC/C,IAAI,WAAW,CAAC,gBAAgB,IAAI,WAAW,CAAC,gBAAgB,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;YAC3F,IAAI,YAAY,GAAG,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;YACpE,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,YAAY,GAAG,GAAG,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC;gBACrD,6BAA6B;gBAC7B,MAAM,YAAY,GAAG,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;gBACtE,IAAI,YAAY,IAAI,YAAY,CAAC,UAAU,EAAE,CAAC;oBAC5C,YAAY,CAAC,UAAU,CAAC,YAAY,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;gBACnE,CAAC;YACH,CAAC;YAED,qBAAqB;YACrB,IAAI,IAAI,GAAG,YAAY,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5D,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,IAAI,GAAG,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;gBACrC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACjC,CAAC;YACD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC,gBAAgB,CAAC;YAEhD,oCAAoC;YACpC,IAAI,WAAW,CAAC,eAAe,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1G,MAAM,eAAe,GAAG,GAAG,CAAC,aAAa,CAAC,+BAA+B,CAAC,CAAC;gBAC3E,eAAe,CAAC,WAAW,GAAG,WAAW,CAAC,eAAe,CAAC;gBAC1D,YAAY,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;YAC5C,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;OAIG;IACK,kBAAkB,CAAC,GAAa,EAAE,QAAc;QACtD,IAAI,CAAC,QAAQ;YAAE,OAAO;QAEtB,MAAM,IAAI,GAAG,GAAG,CAAC,eAAe,CAAC;QAEjC,oBAAoB;QACpB,IAAI,CAAC,QAAQ,CAAC,WAAW,IAAI,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACvG,MAAM,aAAa,GAAG,GAAG,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAC;YAE7D,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;gBACzB,MAAM,SAAS,GAAG,GAAG,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;gBACrD,SAAS,CAAC,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;gBAC7C,aAAa,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;YACvC,CAAC;YAED,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;gBACvB,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;gBACjD,OAAO,CAAC,WAAW,GAAG,QAAQ,CAAC,SAAS,CAAC;gBACzC,aAAa,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACrC,CAAC;YAED,2DAA2D;YAC3D,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC;YACxE,MAAM,WAAW,GAAG,IAAI,CAAC,oBAAoB,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAC,CAAC;YAClF,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC;YACpE,MAAM,WAAW,GAAG,UAAU,IAAI,WAAW,IAAI,QAAQ,IAAI,IAAI,CAAC,oBAAoB,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC;YACtH,IAAI,WAAW,IAAI,WAAW,CAAC,UAAU,EAAE,CAAC;gBAC1C,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,aAAa,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC;YAC9E,CAAC;QACH,CAAC;QAED,uCAAuC;QACvC,IAAI,QAAQ,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3E,MAAM,QAAQ,GAAG,GAAG,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;YACnD,MAAM,YAAY,GAAG,GAAG,CAAC,aAAa,CAAC,wBAAwB,CAAC,CAAC;YACjE,YAAY,CAAC,WAAW,GAAG,QAAQ,CAAC,YAAY,CAAC;YACjD,QAAQ,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YAEnC,6BAA6B;YAC7B,MAAM,YAAY,GAAG,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;YACtE,IAAI,YAAY,IAAI,YAAY,CAAC,UAAU,EAAE,CAAC;gBAC5C,YAAY,CAAC,UAAU,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;YAC/D,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;OAIG;IACK,uBAAuB,CAAC,GAAa,EAAE,OAAuB;QACpE,yBAAyB;QACzB,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,6BAA6B,EAAE,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAEpG,yBAAyB;QACzB,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,6BAA6B,EAAE,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;IACpG,CAAC;IAED;;;;;OAKG;IACK,oBAAoB,CAAC,KAAU;QACrC,MAAM,QAAQ,GAAG,KAAK,EAAE,QAAQ,EAAE,kBAAkB,CAAC;QACrD,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACpE,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,IAAI,KAAK,EAAE,KAAK,IAAI,KAAK,EAAE,KAAK,EAAE,CAAC;YACjC,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;QACtE,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;OAKG;IACK,iBAAiB,CAAC,GAAa,EAAE,aAAqB,EAAE,WAAiB;QAC/E,IAAI,CAAC,WAAW;YAAE,OAAO;QAEzB,MAAM,cAAc,GAAG,GAAG,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,cAAc;YAAE,OAAO;QAE5B,MAAM,KAAK,GAAG,cAAc,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,KAAK;YAAE,OAAO;QAEnB,kCAAkC;QAClC,IAAI,OAAO,GAAG,KAAK,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3D,IAAI,CAAC,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;YAC7E,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;YAE3C,yBAAyB;YACzB,MAAM,SAAS,GAAG,KAAK,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;YACjE,IAAI,SAAS,IAAI,SAAS,CAAC,UAAU,EAAE,CAAC;gBACtC,SAAS,CAAC,UAAU,CAAC,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;YACpE,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YACZ,mBAAmB;YACnB,IAAI,WAAW,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACrE,MAAM,IAAI,GAAG,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;gBAC3C,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC;gBACpC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAC5B,CAAC;YAED,gBAAgB;YAChB,IAAI,WAAW,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3E,MAAM,KAAK,GAAG,GAAG,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;gBACjD,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC;gBACtC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAC7B,CAAC;YAED,YAAY;YACZ,IAAI,WAAW,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAChF,MAAM,KAAK,GAAG,GAAG,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;gBACtD,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC;gBACtC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;OAIG;IACK,gBAAgB,CAAC,GAAa,EAAE,OAAuB;QAC7D,MAAM,YAAY,GAAG,GAAG,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAC;QAEjE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACzE,MAAM,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;YAC7B,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC9B,MAAM,YAAY,GAAI,IAAY,CAAC,QAAQ,CAAC;YAE5C,IAAI,CAAC,YAAY;gBAAE,SAAS;YAE5B,MAAM,WAAW,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7D,IAAI,CAAC,WAAW;gBAAE,SAAS;YAE3B,uBAAuB;YACvB,IAAI,YAAY,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACxF,MAAM,IAAI,GAAG,GAAG,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;gBAClD,IAAI,CAAC,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC;gBAC5C,qBAAqB;gBACrB,MAAM,IAAI,GAAG,WAAW,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC7D,IAAI,IAAI,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;oBAC5B,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC3C,CAAC;qBAAM,CAAC;oBACN,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;gBAChC,CAAC;YACH,CAAC;YAED,gCAAgC;YAChC,IAAI,YAAY,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACtG,MAAM,QAAQ,GAAG,GAAG,CAAC,aAAa,CAAC,+BAA+B,CAAC,CAAC;gBACpE,MAAM,EAAE,GAAG,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;gBACvC,EAAE,CAAC,WAAW,GAAG,IAAI,CAAC,aAAa,IAAI,YAAY,CAAC,WAAW,CAAC;gBAChE,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;gBACzB,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YACpC,CAAC;YAED,+BAA+B;YAC/B,IAAI,YAAY,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,8BAA8B,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACrG,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC,8BAA8B,CAAC,CAAC;gBAClE,MAAM,EAAE,GAAG,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;gBACvC,EAAE,CAAC,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC;gBAC1C,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;gBACxB,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACnC,CAAC;YAED,iCAAiC;YACjC,IAAI,YAAY,CAAC,cAAc,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,gCAAgC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC1G,MAAM,UAAU,GAAG,GAAG,CAAC,aAAa,CAAC,gCAAgC,CAAC,CAAC;gBACvE,MAAM,EAAE,GAAG,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;gBACvC,EAAE,CAAC,WAAW,GAAG,YAAY,CAAC,cAAc,CAAC;gBAC7C,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;gBAC3B,WAAW,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;YACtC,CAAC;YAED,8BAA8B;YAC9B,IAAI,YAAY,CAAC,uBAAuB,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,6BAA6B,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAChH,MAAM,cAAc,GAAG,GAAG,CAAC,aAAa,CAAC,6BAA6B,CAAC,CAAC;gBACxE,MAAM,IAAI,GAAG,GAAG,CAAC,aAAa,CAAC,4BAA4B,CAAC,CAAC;gBAC7D,IAAI,CAAC,WAAW,GAAG,YAAY,CAAC,uBAAuB,CAAC;gBACxD,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;gBACjC,WAAW,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;YAC1C,CAAC;YAED,iCAAiC;YACjC,IAAI,YAAY,CAAC,oBAAoB,EAAE,CAAC;gBACtC,KAAK,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,oBAAoB,CAAC,EAAE,CAAC;oBACtF,MAAM,cAAc,GAAG,GAAG,CAAC,aAAa,CAAC,4BAA4B,CAAC,CAAC;oBAEvE,MAAM,WAAW,GAAG,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;oBAClD,WAAW,CAAC,WAAW,GAAG,QAAQ,CAAC;oBACnC,cAAc,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;oBAExC,MAAM,YAAY,GAAG,GAAG,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;oBACpD,YAAY,CAAC,WAAW,GAAG,SAAmB,CAAC;oBAC/C,cAAc,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;oBAEzC,WAAW,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;gBAC1C,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;CACF"}
|
|
544
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"xrechnung.encoder.js","sourceRoot":"","sources":["../../../../ts/formats/ubl/xrechnung/xrechnung.encoder.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { business } from '@tsclass/tsclass';
|
|
2
|
+
/** The party whose address a country code is written for */
|
|
3
|
+
export type TCountryCodeParty = 'seller' | 'buyer';
|
|
4
|
+
/**
|
|
5
|
+
* The country code an encoder writes for a party's address: an ISO 3166-1
|
|
6
|
+
* alpha-2 code EN 16931 accepts (BR-CL-14, `CodeLists.ISO3166`), taken from
|
|
7
|
+
* `countryCode`, or from `country` when that is already such a code; letter
|
|
8
|
+
* case does not matter. A code is never derived from a country name, so a
|
|
9
|
+
* name, an unknown code or a missing country is refused with an
|
|
10
|
+
* `EInvoiceFormatError` naming the field and the business term.
|
|
11
|
+
* @param address The party's address
|
|
12
|
+
* @param party Whether it is the seller's or the buyer's
|
|
13
|
+
* @param targetFormat The format being written
|
|
14
|
+
*/
|
|
15
|
+
export declare const resolveCountryCode: (address: Partial<business.IAddress> | undefined, party: TCountryCodeParty, targetFormat: string) => string;
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { EInvoiceFormatError } from '../../errors.js';
|
|
2
|
+
import { CodeLists } from '../validation/validation.types.js';
|
|
3
|
+
const partyFields = {
|
|
4
|
+
// BR-09: the seller postal address (BG-5) states the seller country code (BT-40)
|
|
5
|
+
seller: { path: 'from.address', term: 'BT-40', presenceRule: 'BR-09' },
|
|
6
|
+
// BR-11: the buyer postal address (BG-8) states the buyer country code (BT-55)
|
|
7
|
+
buyer: { path: 'to.address', term: 'BT-55', presenceRule: 'BR-11' },
|
|
8
|
+
};
|
|
9
|
+
/**
|
|
10
|
+
* The country code an encoder writes for a party's address: an ISO 3166-1
|
|
11
|
+
* alpha-2 code EN 16931 accepts (BR-CL-14, `CodeLists.ISO3166`), taken from
|
|
12
|
+
* `countryCode`, or from `country` when that is already such a code; letter
|
|
13
|
+
* case does not matter. A code is never derived from a country name, so a
|
|
14
|
+
* name, an unknown code or a missing country is refused with an
|
|
15
|
+
* `EInvoiceFormatError` naming the field and the business term.
|
|
16
|
+
* @param address The party's address
|
|
17
|
+
* @param party Whether it is the seller's or the buyer's
|
|
18
|
+
* @param targetFormat The format being written
|
|
19
|
+
*/
|
|
20
|
+
export const resolveCountryCode = (address, party, targetFormat) => {
|
|
21
|
+
const { path, term, presenceRule } = partyFields[party];
|
|
22
|
+
const refuse = (rule, message) => {
|
|
23
|
+
throw new EInvoiceFormatError(`${rule}: ${message}`, { targetFormat, unsupportedFeatures: [rule] });
|
|
24
|
+
};
|
|
25
|
+
const countryCode = (address?.countryCode ?? '').trim();
|
|
26
|
+
if (countryCode) {
|
|
27
|
+
if (!CodeLists.ISO3166.codes.has(countryCode.toUpperCase())) {
|
|
28
|
+
refuse('BR-CL-14', `the ${party} country code (${term}) is an ISO 3166-1 alpha-2 code, ${path}.countryCode is "${countryCode}"`);
|
|
29
|
+
}
|
|
30
|
+
return countryCode.toUpperCase();
|
|
31
|
+
}
|
|
32
|
+
const country = (address?.country ?? '').trim();
|
|
33
|
+
if (!country) {
|
|
34
|
+
refuse(presenceRule, `the ${party} postal address states a country code (${term}), ${path}.countryCode and ${path}.country are missing`);
|
|
35
|
+
}
|
|
36
|
+
if (!CodeLists.ISO3166.codes.has(country.toUpperCase())) {
|
|
37
|
+
refuse('BR-CL-14', `the ${party} country code (${term}) is an ISO 3166-1 alpha-2 code, ${path}.countryCode is missing and ${path}.country is "${country}", which is not one; a code is not derived from a country name`);
|
|
38
|
+
}
|
|
39
|
+
return country.toUpperCase();
|
|
40
|
+
};
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY291bnRyeS5jb2RlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vdHMvZm9ybWF0cy91dGlscy9jb3VudHJ5LmNvZGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDdEQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBSzlELE1BQU0sV0FBVyxHQUFvRjtJQUNuRyxpRkFBaUY7SUFDakYsTUFBTSxFQUFFLEVBQUUsSUFBSSxFQUFFLGNBQWMsRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLFlBQVksRUFBRSxPQUFPLEVBQUU7SUFDdEUsK0VBQStFO0lBQy9FLEtBQUssRUFBRSxFQUFFLElBQUksRUFBRSxZQUFZLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxZQUFZLEVBQUUsT0FBTyxFQUFFO0NBQ3BFLENBQUM7QUFFRjs7Ozs7Ozs7OztHQVVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sa0JBQWtCLEdBQUcsQ0FDaEMsT0FBK0MsRUFDL0MsS0FBd0IsRUFDeEIsWUFBb0IsRUFDWixFQUFFO0lBQ1YsTUFBTSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsWUFBWSxFQUFFLEdBQUcsV0FBVyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3hELE1BQU0sTUFBTSxHQUFHLENBQUMsSUFBWSxFQUFFLE9BQWUsRUFBUyxFQUFFO1FBQ3RELE1BQU0sSUFBSSxtQkFBbUIsQ0FBQyxHQUFHLElBQUksS0FBSyxPQUFPLEVBQUUsRUFBRSxFQUFFLFlBQVksRUFBRSxtQkFBbUIsRUFBRSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUN0RyxDQUFDLENBQUM7SUFDRixNQUFNLFdBQVcsR0FBRyxDQUFDLE9BQU8sRUFBRSxXQUFXLElBQUksRUFBRSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDeEQsSUFBSSxXQUFXLEVBQUUsQ0FBQztRQUNoQixJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxFQUFFLENBQUM7WUFDNUQsTUFBTSxDQUFDLFVBQVUsRUFBRSxPQUFPLEtBQUssa0JBQWtCLElBQUksb0NBQW9DLElBQUksb0JBQW9CLFdBQVcsR0FBRyxDQUFDLENBQUM7UUFDbkksQ0FBQztRQUNELE9BQU8sV0FBVyxDQUFDLFdBQVcsRUFBRSxDQUFDO0lBQ25DLENBQUM7SUFDRCxNQUFNLE9BQU8sR0FBRyxDQUFDLE9BQU8sRUFBRSxPQUFPLElBQUksRUFBRSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDaEQsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2IsTUFBTSxDQUFDLFlBQVksRUFBRSxPQUFPLEtBQUssMENBQTBDLElBQUksTUFBTSxJQUFJLG9CQUFvQixJQUFJLHNCQUFzQixDQUFDLENBQUM7SUFDM0ksQ0FBQztJQUNELElBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsRUFBRSxDQUFDLEVBQUUsQ0FBQztRQUN4RCxNQUFNLENBQ0osVUFBVSxFQUNWLE9BQU8sS0FBSyxrQkFBa0IsSUFBSSxvQ0FBb0MsSUFBSSwrQkFBK0IsSUFBSSxnQkFBZ0IsT0FBTyxnRUFBZ0UsQ0FDck0sQ0FBQztJQUNKLENBQUM7SUFDRCxPQUFPLE9BQU8sQ0FBQyxXQUFXLEVBQUUsQ0FBQztBQUMvQixDQUFDLENBQUMifQ==
|
|
@@ -54,12 +54,12 @@ export class CodeListValidator {
|
|
|
54
54
|
// Buyer country (BT-55)
|
|
55
55
|
const buyerCountry = invoice.to?.address?.countryCode;
|
|
56
56
|
if (buyerCountry && !CodeLists.ISO3166.codes.has(buyerCountry.toUpperCase())) {
|
|
57
|
-
this.addError('BR-CL-
|
|
57
|
+
this.addError('BR-CL-14', `Invalid buyer country code: ${buyerCountry}. Must be ISO 3166-1 alpha-2`, 'EN16931', 'to.address.countryCode', 'BT-55', buyerCountry, 'Two-letter country code (e.g., DE, FR, IT)');
|
|
58
58
|
}
|
|
59
59
|
// Delivery country (BT-80)
|
|
60
60
|
const deliveryCountry = invoice.metadata?.deliveryAddress?.countryCode;
|
|
61
61
|
if (deliveryCountry && !CodeLists.ISO3166.codes.has(deliveryCountry.toUpperCase())) {
|
|
62
|
-
this.addError('BR-CL-
|
|
62
|
+
this.addError('BR-CL-14', `Invalid delivery country code: ${deliveryCountry}. Must be ISO 3166-1 alpha-2`, 'EN16931', 'metadata.deliveryAddress.countryCode', 'BT-80', deliveryCountry, 'Two-letter country code (e.g., DE, FR, IT)');
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
65
|
/**
|
|
@@ -11,13 +11,30 @@ export const CodeLists = {
|
|
|
11
11
|
'RON', 'BGN', 'HRK', 'TRY', 'ISK', 'JPY', 'CNY', 'AUD', 'CAD', 'NZD'
|
|
12
12
|
])
|
|
13
13
|
},
|
|
14
|
-
// ISO 3166-1 alpha-2
|
|
14
|
+
// ISO 3166-1 alpha-2 country codes, as EN 16931 accepts them (BR-CL-14, BR-CL-15): the code list
|
|
15
|
+
// of the CEN/TC 434 validation artefacts 1.3.16 for UBL, which adds 1A (Kosovo) and XI (Northern
|
|
16
|
+
// Ireland) to the codes ISO 3166-1 assigns
|
|
15
17
|
ISO3166: {
|
|
16
|
-
version: '
|
|
18
|
+
version: 'EN 16931 validation artefacts 1.3.16',
|
|
17
19
|
codes: new Set([
|
|
18
|
-
'
|
|
19
|
-
'
|
|
20
|
-
'
|
|
20
|
+
'1A', 'AD', 'AE', 'AF', 'AG', 'AI', 'AL', 'AM', 'AO', 'AQ', 'AR', 'AS', 'AT', 'AU',
|
|
21
|
+
'AW', 'AX', 'AZ', 'BA', 'BB', 'BD', 'BE', 'BF', 'BG', 'BH', 'BI', 'BJ', 'BL', 'BM',
|
|
22
|
+
'BN', 'BO', 'BQ', 'BR', 'BS', 'BT', 'BV', 'BW', 'BY', 'BZ', 'CA', 'CC', 'CD', 'CF',
|
|
23
|
+
'CG', 'CH', 'CI', 'CK', 'CL', 'CM', 'CN', 'CO', 'CR', 'CU', 'CV', 'CW', 'CX', 'CY',
|
|
24
|
+
'CZ', 'DE', 'DJ', 'DK', 'DM', 'DO', 'DZ', 'EC', 'EE', 'EG', 'EH', 'ER', 'ES', 'ET',
|
|
25
|
+
'FI', 'FJ', 'FK', 'FM', 'FO', 'FR', 'GA', 'GB', 'GD', 'GE', 'GF', 'GG', 'GH', 'GI',
|
|
26
|
+
'GL', 'GM', 'GN', 'GP', 'GQ', 'GR', 'GS', 'GT', 'GU', 'GW', 'GY', 'HK', 'HM', 'HN',
|
|
27
|
+
'HR', 'HT', 'HU', 'ID', 'IE', 'IL', 'IM', 'IN', 'IO', 'IQ', 'IR', 'IS', 'IT', 'JE',
|
|
28
|
+
'JM', 'JO', 'JP', 'KE', 'KG', 'KH', 'KI', 'KM', 'KN', 'KP', 'KR', 'KW', 'KY', 'KZ',
|
|
29
|
+
'LA', 'LB', 'LC', 'LI', 'LK', 'LR', 'LS', 'LT', 'LU', 'LV', 'LY', 'MA', 'MC', 'MD',
|
|
30
|
+
'ME', 'MF', 'MG', 'MH', 'MK', 'ML', 'MM', 'MN', 'MO', 'MP', 'MQ', 'MR', 'MS', 'MT',
|
|
31
|
+
'MU', 'MV', 'MW', 'MX', 'MY', 'MZ', 'NA', 'NC', 'NE', 'NF', 'NG', 'NI', 'NL', 'NO',
|
|
32
|
+
'NP', 'NR', 'NU', 'NZ', 'OM', 'PA', 'PE', 'PF', 'PG', 'PH', 'PK', 'PL', 'PM', 'PN',
|
|
33
|
+
'PR', 'PS', 'PT', 'PW', 'PY', 'QA', 'RE', 'RO', 'RS', 'RU', 'RW', 'SA', 'SB', 'SC',
|
|
34
|
+
'SD', 'SE', 'SG', 'SH', 'SI', 'SJ', 'SK', 'SL', 'SM', 'SN', 'SO', 'SR', 'SS', 'ST',
|
|
35
|
+
'SV', 'SX', 'SY', 'SZ', 'TC', 'TD', 'TF', 'TG', 'TH', 'TJ', 'TK', 'TL', 'TM', 'TN',
|
|
36
|
+
'TO', 'TR', 'TT', 'TV', 'TW', 'TZ', 'UA', 'UG', 'UM', 'US', 'UY', 'UZ', 'VA', 'VC',
|
|
37
|
+
'VE', 'VG', 'VI', 'VN', 'VU', 'WF', 'WS', 'XI', 'YE', 'YT', 'ZA', 'ZM', 'ZW',
|
|
21
38
|
])
|
|
22
39
|
},
|
|
23
40
|
// UNCL5305 Tax category codes
|
|
@@ -151,4 +168,4 @@ export const SemanticModel = {
|
|
|
151
168
|
BG31: 'Item information',
|
|
152
169
|
BG32: 'Item attributes'
|
|
153
170
|
};
|
|
154
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
171
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"validation.types.js","sourceRoot":"","sources":["../../../ts/formats/validation/validation.types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAqFH,wBAAwB;AACxB,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,0BAA0B;IAC1B,OAAO,EAAE;QACP,OAAO,EAAE,MAAM;QACf,KAAK,EAAE,IAAI,GAAG,CAAC;YACb,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;YACpE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;SACrE,CAAC;KACH;IAED,iGAAiG;IACjG,iGAAiG;IACjG,2CAA2C;IAC3C,OAAO,EAAE;QACP,OAAO,EAAE,sCAAsC;QAC/C,KAAK,EAAE,IAAI,GAAG,CAAC;YACb,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;YAClF,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;YAClF,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;YAClF,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;YAClF,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;YAClF,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;YAClF,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;YAClF,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;YAClF,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;YAClF,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;YAClF,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;YAClF,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;YAClF,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;YAClF,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fin.cx/einvoice",
|
|
3
|
-
"version": "8.3.
|
|
3
|
+
"version": "8.3.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A TypeScript module for creating, manipulating, and embedding XML data within PDF files specifically tailored for electronic invoice (einvoice) packages.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
@@ -67,7 +67,7 @@
|
|
|
67
67
|
],
|
|
68
68
|
"scripts": {
|
|
69
69
|
"test": "pnpm run test:unit",
|
|
70
|
-
"test:unit": "tstest test/test.cii-xrechnung.node.ts --verbose --logfile --timeout 60 && tstest test/test.einvoice.ts --verbose --logfile --timeout 60 && tstest test/test.decimal.ts --verbose --logfile --timeout 60 && tstest test/test.decimal-currency-calculator.ts --verbose --logfile --timeout 60 && tstest test/test.currency-utils.ts --verbose --logfile --timeout 60 && tstest test/test.en16931-validators.ts --verbose --logfile --timeout 60 && tstest test/test.schematron-validator.ts --verbose --logfile --timeout 60 && tstest test/test.xrechnung-creditnote.node.ts --verbose --logfile --timeout 60 && tstest test/test.accountingdoc-types.node.ts --verbose --logfile --timeout 60 && tstest test/test.corrected-invoice.node.ts --verbose --logfile --timeout 60 && tstest test/test.xrechnung-3-due-date.node.ts --verbose --logfile --timeout 60 && tstest test/test.calendar-dates.node.ts --verbose --logfile --timeout 60 && tstest test/test.document-totals.node.ts --verbose --logfile --timeout 60 && tstest test/test.reverse-charge.node.ts --verbose --logfile --timeout 60 && tstest test/test.cii-schema-order.node.ts --verbose --logfile --timeout 60 && tstest test/test.tax-number.node.ts --verbose --logfile --timeout 60 && tstest test/test.en16931-unitcodes.node.ts --verbose --logfile --timeout 60 && tstest test/test.en16931-lineunit.node.ts --verbose --logfile --timeout 60",
|
|
70
|
+
"test:unit": "tstest test/test.cii-xrechnung.node.ts --verbose --logfile --timeout 60 && tstest test/test.einvoice.ts --verbose --logfile --timeout 60 && tstest test/test.decimal.ts --verbose --logfile --timeout 60 && tstest test/test.decimal-currency-calculator.ts --verbose --logfile --timeout 60 && tstest test/test.currency-utils.ts --verbose --logfile --timeout 60 && tstest test/test.en16931-validators.ts --verbose --logfile --timeout 60 && tstest test/test.schematron-validator.ts --verbose --logfile --timeout 60 && tstest test/test.xrechnung-creditnote.node.ts --verbose --logfile --timeout 60 && tstest test/test.accountingdoc-types.node.ts --verbose --logfile --timeout 60 && tstest test/test.corrected-invoice.node.ts --verbose --logfile --timeout 60 && tstest test/test.xrechnung-3-due-date.node.ts --verbose --logfile --timeout 60 && tstest test/test.calendar-dates.node.ts --verbose --logfile --timeout 60 && tstest test/test.document-totals.node.ts --verbose --logfile --timeout 60 && tstest test/test.reverse-charge.node.ts --verbose --logfile --timeout 60 && tstest test/test.cii-schema-order.node.ts --verbose --logfile --timeout 60 && tstest test/test.tax-number.node.ts --verbose --logfile --timeout 60 && tstest test/test.country-codes.node.ts --verbose --logfile --timeout 60 && tstest test/test.en16931-unitcodes.node.ts --verbose --logfile --timeout 60 && tstest test/test.en16931-lineunit.node.ts --verbose --logfile --timeout 60",
|
|
71
71
|
"test:format": "tstest test/test.format-detection.ts --verbose --logfile --timeout 60",
|
|
72
72
|
"test:corpus": "tstest test/suite/einvoice_corpus-validation/ --verbose --logfile --timeout 60",
|
|
73
73
|
"test:performance": "NODE_OPTIONS=--expose-gc tstest test/suite/einvoice_performance/ --verbose --logfile --timeout 60",
|
package/readme.md
CHANGED
|
@@ -410,6 +410,7 @@ the UTC midnight of that day, `Date.UTC(2026, 8, 20)`.
|
|
|
410
410
|
Missing or invalid document-level invoice IDs and issue dates are rejected.
|
|
411
411
|
- `FatturaPA` should be documented as detection-only right now.
|
|
412
412
|
- The day of supply: UBL and XRechnung write `deliveryDate` as `cac:Delivery/cbc:ActualDeliveryDate` (BT-72) and `periodOfPerformance` as `cac:InvoicePeriod` (BG-14), and read both back. Factur-X and ZUGFeRD write `deliveryDate` as `ram:ActualDeliverySupplyChainEvent` and read it back only when the document states it.
|
|
413
|
+
- Country codes: every format writes the seller and buyer country (BT-40, BT-55) as an ISO 3166-1 alpha-2 code EN 16931 accepts (BR-CL-14), taken from `address.countryCode`, or from `address.country` when that is already such a code (letter case does not matter). A code is never derived from a country name: a name without a `countryCode`, a code EN 16931 does not know, or a missing country is refused with an `EInvoiceFormatError` naming the field (BR-CL-14, BR-09, BR-11).
|
|
413
414
|
- Party identifiers: `registrationDetails.vatId` is the VAT identifier (BT-31 seller, BT-48 buyer), `registrationId` the legal registration identifier such as the commercial register number (BT-30, BT-47), and `taxNumber` the seller's tax registration identifier, the Steuernummer (BT-32), which § 14 Abs. 4 Satz 1 Nr. 2 UStG allows in place of the VAT identifier. UBL and XRechnung write the tax number as a second `cac:PartyTaxScheme` with the tax scheme `FC`, after the VAT one; Factur-X and ZUGFeRD as `ram:SpecifiedTaxRegistration/ram:ID` with the scheme `FC`. The decoders read each by its scheme, whatever order the document lists them in. EN 16931 has no tax number for the buyer, so a buyer's `taxNumber` is not written.
|
|
414
415
|
- Credit notes, debit notes, corrected invoices and self-billed invoices share the `EInvoice` class; see the type code table above. Credit and debit amounts are written as given, the encoders do not change signs.
|
|
415
416
|
- ZUGFeRD v1 input is detected and routed, but the v1 decoder does not read the v1 header, so such a document always arrives as an `invoice`. Known defect, to be fixed separately.
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@fin.cx/einvoice',
|
|
6
|
-
version: '8.3.
|
|
6
|
+
version: '8.3.1',
|
|
7
7
|
description: 'A TypeScript module for creating, manipulating, and embedding XML data within PDF files specifically tailored for electronic invoice (einvoice) packages.'
|
|
8
8
|
}
|
|
@@ -5,6 +5,7 @@ import { DOMParser, XMLSerializer } from '../../../plugins.js';
|
|
|
5
5
|
import { getDocumentTypeCode } from '../../utils/document.typecode.js';
|
|
6
6
|
import { computeDocumentTotals } from '../../utils/document.totals.js';
|
|
7
7
|
import { toPlainDecimalString } from '../../utils/number.text.js';
|
|
8
|
+
import { resolveCountryCode } from '../../utils/country.code.js';
|
|
8
9
|
import { getWritableDate, getWritableDueDate } from '../../utils/date.value.js';
|
|
9
10
|
|
|
10
11
|
/**
|
|
@@ -265,9 +266,10 @@ export class FacturXEncoder extends CIIBaseEncoder {
|
|
|
265
266
|
cityElement.textContent = party.address.city;
|
|
266
267
|
addressElement.appendChild(cityElement);
|
|
267
268
|
|
|
268
|
-
//
|
|
269
|
+
// Country code (BT-40, BT-55), mandatory (BR-09, BR-11): an ISO 3166-1 alpha-2 code, never
|
|
270
|
+
// derived from a name (BR-CL-14)
|
|
269
271
|
const countryElement = doc.createElement('ram:CountryID');
|
|
270
|
-
countryElement.textContent = party.address
|
|
272
|
+
countryElement.textContent = resolveCountryCode(party.address, partyRole, 'cii');
|
|
271
273
|
addressElement.appendChild(countryElement);
|
|
272
274
|
|
|
273
275
|
partyElement.appendChild(addressElement);
|
|
@@ -8,6 +8,7 @@ import { getWritableDate, getWritableDueDate } from '../../utils/date.value.js';
|
|
|
8
8
|
import { getPaymentTermsNote } from '../../utils/payment.terms.js';
|
|
9
9
|
import { computeDocumentTotals } from '../../utils/document.totals.js';
|
|
10
10
|
import { toPlainDecimalString } from '../../utils/number.text.js';
|
|
11
|
+
import { resolveCountryCode } from '../../utils/country.code.js';
|
|
11
12
|
|
|
12
13
|
/**
|
|
13
14
|
* Encoder for ZUGFeRD invoice format
|
|
@@ -300,12 +301,11 @@ export class ZUGFeRDEncoder extends CIIBaseEncoder {
|
|
|
300
301
|
addressElement.appendChild(cityElement);
|
|
301
302
|
}
|
|
302
303
|
|
|
303
|
-
//
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
}
|
|
304
|
+
// Country code (BT-40, BT-55), mandatory (BR-09, BR-11): an ISO 3166-1 alpha-2 code, never
|
|
305
|
+
// derived from a name (BR-CL-14)
|
|
306
|
+
const countryElement = doc.createElement('ram:CountryID');
|
|
307
|
+
countryElement.textContent = resolveCountryCode(party.address, partyRole, 'cii');
|
|
308
|
+
addressElement.appendChild(countryElement);
|
|
309
309
|
|
|
310
310
|
partyElement.appendChild(addressElement);
|
|
311
311
|
|
|
@@ -8,6 +8,7 @@ import { getWritableDueDate } from '../../utils/date.value.js';
|
|
|
8
8
|
import { getPaymentTermsNote } from '../../utils/payment.terms.js';
|
|
9
9
|
import { computeDocumentTotals } from '../../utils/document.totals.js';
|
|
10
10
|
import { toPlainDecimalString } from '../../utils/number.text.js';
|
|
11
|
+
import { resolveCountryCode } from '../../utils/country.code.js';
|
|
11
12
|
|
|
12
13
|
/**
|
|
13
14
|
* UBL Encoder implementation
|
|
@@ -253,17 +254,18 @@ export class UBLEncoder extends UBLBaseEncoder {
|
|
|
253
254
|
this.appendElement(doc, postalAddressNode, 'cbc:PostalZone', party.address.postalCode);
|
|
254
255
|
}
|
|
255
256
|
|
|
256
|
-
// Country
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
257
|
+
// Country code (BT-40, BT-55), mandatory (BR-09, BR-11): an ISO 3166-1 alpha-2 code, never
|
|
258
|
+
// derived from a name (BR-CL-14)
|
|
259
|
+
const countryNode = doc.createElement('cac:Country');
|
|
260
|
+
postalAddressNode.appendChild(countryNode);
|
|
261
|
+
this.appendElement(
|
|
262
|
+
doc,
|
|
263
|
+
countryNode,
|
|
264
|
+
'cbc:IdentificationCode',
|
|
265
|
+
resolveCountryCode(party.address, elementName === 'cac:AccountingSupplierParty' ? 'seller' : 'buyer', 'ubl'),
|
|
266
|
+
);
|
|
267
|
+
if (party.address.country) {
|
|
268
|
+
this.appendElement(doc, countryNode, 'cbc:Name', party.address.country);
|
|
267
269
|
}
|
|
268
270
|
|
|
269
271
|
// Party tax scheme (VAT ID)
|
|
@@ -576,19 +578,6 @@ export class UBLEncoder extends UBLBaseEncoder {
|
|
|
576
578
|
parentElement.appendChild(element);
|
|
577
579
|
}
|
|
578
580
|
|
|
579
|
-
/**
|
|
580
|
-
* Helper method to get country code from country name
|
|
581
|
-
* Simple implementation that assumes the country name is already a code
|
|
582
|
-
* @param countryName Country name
|
|
583
|
-
* @returns Country code (2-letter ISO code)
|
|
584
|
-
*/
|
|
585
|
-
private getCountryCode(countryName: string): string {
|
|
586
|
-
// In a real implementation, this would map country names to ISO codes
|
|
587
|
-
// For now, just return the first 2 characters or "XX" as fallback
|
|
588
|
-
if (!countryName) return 'XX';
|
|
589
|
-
return countryName.length >= 2 ? countryName.substring(0, 2).toUpperCase() : 'XX';
|
|
590
|
-
}
|
|
591
|
-
|
|
592
581
|
/**
|
|
593
582
|
* Preserves metadata from invoice to enhance UBL XML output
|
|
594
583
|
* @param doc XML document
|
|
@@ -89,9 +89,6 @@ export class XRechnungEncoder extends UBLEncoder {
|
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
91
|
|
|
92
|
-
// Add country code handling for German addresses
|
|
93
|
-
this.fixGermanCountryCodes(doc);
|
|
94
|
-
|
|
95
92
|
// Preserve business references from metadata
|
|
96
93
|
this.addBusinessReferences(doc, metadata?.businessReferences);
|
|
97
94
|
|
|
@@ -207,26 +204,6 @@ export class XRechnungEncoder extends UBLEncoder {
|
|
|
207
204
|
}
|
|
208
205
|
}
|
|
209
206
|
|
|
210
|
-
/**
|
|
211
|
-
* Fixes German country codes in the document
|
|
212
|
-
* @param doc XML document
|
|
213
|
-
*/
|
|
214
|
-
private fixGermanCountryCodes(doc: Document): void {
|
|
215
|
-
const countryNodes = doc.getElementsByTagName('cbc:IdentificationCode');
|
|
216
|
-
for (let i = 0; i < countryNodes.length; i++) {
|
|
217
|
-
const node = countryNodes[i];
|
|
218
|
-
if (node.textContent) {
|
|
219
|
-
const text = node.textContent.toLowerCase();
|
|
220
|
-
if (text === 'germany' || text === 'deutschland' || text === 'de') {
|
|
221
|
-
node.textContent = 'DE';
|
|
222
|
-
} else if (text.length > 2) {
|
|
223
|
-
// Try to use first 2 characters as country code
|
|
224
|
-
node.textContent = text.substring(0, 2).toUpperCase();
|
|
225
|
-
}
|
|
226
|
-
}
|
|
227
|
-
}
|
|
228
|
-
}
|
|
229
|
-
|
|
230
207
|
/**
|
|
231
208
|
* Adds business references from metadata to the document
|
|
232
209
|
* @param doc XML document
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import type { business } from '@tsclass/tsclass';
|
|
2
|
+
import { EInvoiceFormatError } from '../../errors.js';
|
|
3
|
+
import { CodeLists } from '../validation/validation.types.js';
|
|
4
|
+
|
|
5
|
+
/** The party whose address a country code is written for */
|
|
6
|
+
export type TCountryCodeParty = 'seller' | 'buyer';
|
|
7
|
+
|
|
8
|
+
const partyFields: Record<TCountryCodeParty, { path: string; term: string; presenceRule: string }> = {
|
|
9
|
+
// BR-09: the seller postal address (BG-5) states the seller country code (BT-40)
|
|
10
|
+
seller: { path: 'from.address', term: 'BT-40', presenceRule: 'BR-09' },
|
|
11
|
+
// BR-11: the buyer postal address (BG-8) states the buyer country code (BT-55)
|
|
12
|
+
buyer: { path: 'to.address', term: 'BT-55', presenceRule: 'BR-11' },
|
|
13
|
+
};
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* The country code an encoder writes for a party's address: an ISO 3166-1
|
|
17
|
+
* alpha-2 code EN 16931 accepts (BR-CL-14, `CodeLists.ISO3166`), taken from
|
|
18
|
+
* `countryCode`, or from `country` when that is already such a code; letter
|
|
19
|
+
* case does not matter. A code is never derived from a country name, so a
|
|
20
|
+
* name, an unknown code or a missing country is refused with an
|
|
21
|
+
* `EInvoiceFormatError` naming the field and the business term.
|
|
22
|
+
* @param address The party's address
|
|
23
|
+
* @param party Whether it is the seller's or the buyer's
|
|
24
|
+
* @param targetFormat The format being written
|
|
25
|
+
*/
|
|
26
|
+
export const resolveCountryCode = (
|
|
27
|
+
address: Partial<business.IAddress> | undefined,
|
|
28
|
+
party: TCountryCodeParty,
|
|
29
|
+
targetFormat: string,
|
|
30
|
+
): string => {
|
|
31
|
+
const { path, term, presenceRule } = partyFields[party];
|
|
32
|
+
const refuse = (rule: string, message: string): never => {
|
|
33
|
+
throw new EInvoiceFormatError(`${rule}: ${message}`, { targetFormat, unsupportedFeatures: [rule] });
|
|
34
|
+
};
|
|
35
|
+
const countryCode = (address?.countryCode ?? '').trim();
|
|
36
|
+
if (countryCode) {
|
|
37
|
+
if (!CodeLists.ISO3166.codes.has(countryCode.toUpperCase())) {
|
|
38
|
+
refuse('BR-CL-14', `the ${party} country code (${term}) is an ISO 3166-1 alpha-2 code, ${path}.countryCode is "${countryCode}"`);
|
|
39
|
+
}
|
|
40
|
+
return countryCode.toUpperCase();
|
|
41
|
+
}
|
|
42
|
+
const country = (address?.country ?? '').trim();
|
|
43
|
+
if (!country) {
|
|
44
|
+
refuse(presenceRule, `the ${party} postal address states a country code (${term}), ${path}.countryCode and ${path}.country are missing`);
|
|
45
|
+
}
|
|
46
|
+
if (!CodeLists.ISO3166.codes.has(country.toUpperCase())) {
|
|
47
|
+
refuse(
|
|
48
|
+
'BR-CL-14',
|
|
49
|
+
`the ${party} country code (${term}) is an ISO 3166-1 alpha-2 code, ${path}.countryCode is missing and ${path}.country is "${country}", which is not one; a code is not derived from a country name`,
|
|
50
|
+
);
|
|
51
|
+
}
|
|
52
|
+
return country.toUpperCase();
|
|
53
|
+
};
|
|
@@ -96,7 +96,7 @@ export class CodeListValidator {
|
|
|
96
96
|
const buyerCountry = invoice.to?.address?.countryCode;
|
|
97
97
|
if (buyerCountry && !CodeLists.ISO3166.codes.has(buyerCountry.toUpperCase())) {
|
|
98
98
|
this.addError(
|
|
99
|
-
'BR-CL-
|
|
99
|
+
'BR-CL-14',
|
|
100
100
|
`Invalid buyer country code: ${buyerCountry}. Must be ISO 3166-1 alpha-2`,
|
|
101
101
|
'EN16931',
|
|
102
102
|
'to.address.countryCode',
|
|
@@ -110,7 +110,7 @@ export class CodeListValidator {
|
|
|
110
110
|
const deliveryCountry = invoice.metadata?.deliveryAddress?.countryCode;
|
|
111
111
|
if (deliveryCountry && !CodeLists.ISO3166.codes.has(deliveryCountry.toUpperCase())) {
|
|
112
112
|
this.addError(
|
|
113
|
-
'BR-CL-
|
|
113
|
+
'BR-CL-14',
|
|
114
114
|
`Invalid delivery country code: ${deliveryCountry}. Must be ISO 3166-1 alpha-2`,
|
|
115
115
|
'EN16931',
|
|
116
116
|
'metadata.deliveryAddress.countryCode',
|