@fin.cx/compatibility 5.2.1 → 5.3.0
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/buchungsliste/index.d.ts +1 -1
- package/dist_ts/buchungsliste/index.js +21 -19
- package/dist_ts/error.d.ts +20 -1
- package/dist_ts/error.js +1 -1
- package/package.json +2 -2
- package/readme.md +11 -8
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/buchungsliste/index.ts +34 -19
- package/ts/error.ts +28 -1
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@fin.cx/compatibility',
|
|
6
|
-
version: '5.
|
|
6
|
+
version: '5.3.0',
|
|
7
7
|
description: 'Exchange formats of third-party accounting systems: the EXTF Buchungsstapel in Windows-1252 on the rows of @fin.cx/skr, the document-image archive (document.xml and ZIP), and a payroll program\'s Buchungsliste read into journal drafts'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx1QkFBdUI7SUFDN0IsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLDRPQUE0TztDQUMxUCxDQUFBIn0=
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
|
-
export { CompatibilityError, type TCompatibilityErrorCode, type ICompatibilityErrorDetails } from '../error.js';
|
|
2
|
+
export { CompatibilityError, type TCompatibilityErrorCode, type ICompatibilityErrorDetails, type TBuchungslisteRefusalReason, } from '../error.js';
|
|
3
3
|
export type IDatevBuchungsstapelRow = plugins.skrCore.IDatevBuchungsstapelRow;
|
|
4
4
|
/** One row of a Buchungsliste as the file states it: one booking of the amount from the Sollkonto to the Habenkonto. */
|
|
5
5
|
export interface IBuchungslisteRow {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
2
|
import { CompatibilityError } from '../error.js';
|
|
3
3
|
import { decodeWindows1252 } from '../encoding/index.js';
|
|
4
|
-
export { CompatibilityError } from '../error.js';
|
|
4
|
+
export { CompatibilityError, } from '../error.js';
|
|
5
5
|
/** How a field is named in a refusal when the file names no column of it. */
|
|
6
6
|
const FIELD_NAMES = {
|
|
7
7
|
belegdatum: 'Belegdatum',
|
|
@@ -63,8 +63,8 @@ const columnKeyOf = (nameArg) => nameArg
|
|
|
63
63
|
.replace(/ü/gu, 'ue')
|
|
64
64
|
.replace(/ß/gu, 'ss')
|
|
65
65
|
.replace(/[^a-z0-9%]/gu, '');
|
|
66
|
-
/** A Buchungsliste that cannot be read as it is. */
|
|
67
|
-
const refusal = (messageArg, detailsArg) => new CompatibilityError('invalid_buchungsliste', messageArg, detailsArg);
|
|
66
|
+
/** A Buchungsliste that cannot be read as it is, and why. */
|
|
67
|
+
const refusal = (reasonArg, messageArg, detailsArg) => new CompatibilityError('invalid_buchungsliste', messageArg, { reason: reasonArg, ...detailsArg });
|
|
68
68
|
/**
|
|
69
69
|
* The delimiter the first line separates its names by: the first of semicolon, tab and comma that stands in it outside
|
|
70
70
|
* double quotes (unconfirmed which one lohn+gehalt writes). Refuses a first line that has none: a single name cannot
|
|
@@ -83,7 +83,7 @@ const delimiterOf = (firstLineArg, lineArg) => {
|
|
|
83
83
|
}
|
|
84
84
|
const delimiter = DELIMITERS.find((delimiterArg) => outside.has(delimiterArg));
|
|
85
85
|
if (delimiter === undefined) {
|
|
86
|
-
throw refusal(`line ${lineArg}: the field names of the first line are separated by none of semicolon, tab and comma`, { line: lineArg });
|
|
86
|
+
throw refusal('unreadable', `line ${lineArg}: the field names of the first line are separated by none of semicolon, tab and comma`, { line: lineArg });
|
|
87
87
|
}
|
|
88
88
|
return delimiter;
|
|
89
89
|
};
|
|
@@ -136,7 +136,7 @@ const recordsOf = (textArg, delimiterArg) => {
|
|
|
136
136
|
}
|
|
137
137
|
}
|
|
138
138
|
else if (closed) {
|
|
139
|
-
throw refusal(`line ${line}: field ${fields.length + 1} has text after its closing quote`, { line });
|
|
139
|
+
throw refusal('unreadable', `line ${line}: field ${fields.length + 1} has text after its closing quote`, { line });
|
|
140
140
|
}
|
|
141
141
|
else if (char === '"' && current === '') {
|
|
142
142
|
quoted = true;
|
|
@@ -146,7 +146,7 @@ const recordsOf = (textArg, delimiterArg) => {
|
|
|
146
146
|
}
|
|
147
147
|
}
|
|
148
148
|
if (quoted) {
|
|
149
|
-
throw refusal(`line ${recordLine}: field ${fields.length + 1} opens a quote that is never closed`, { line: recordLine });
|
|
149
|
+
throw refusal('unreadable', `line ${recordLine}: field ${fields.length + 1} opens a quote that is never closed`, { line: recordLine });
|
|
150
150
|
}
|
|
151
151
|
// the last record, where the text does not end in a line break
|
|
152
152
|
if (current !== '' || closed || fields.length > 0) {
|
|
@@ -196,19 +196,19 @@ const centsOf = (valueArg) => {
|
|
|
196
196
|
*/
|
|
197
197
|
export const readBuchungsliste = (bytesArg) => {
|
|
198
198
|
if (bytesArg[0] === 0xef && bytesArg[1] === 0xbb && bytesArg[2] === 0xbf) {
|
|
199
|
-
throw refusal('the Buchungsliste begins with the byte order mark of UTF-8; it is read as Windows-1252 (ANSI)', { line: 1 });
|
|
199
|
+
throw refusal('unreadable', 'the Buchungsliste begins with the byte order mark of UTF-8; it is read as Windows-1252 (ANSI)', { line: 1 });
|
|
200
200
|
}
|
|
201
201
|
const text = decodeWindows1252(bytesArg);
|
|
202
202
|
const lines = text.split(/\r\n|\n|\r/u);
|
|
203
203
|
// the first line that states anything names the fields
|
|
204
204
|
const firstLineIndex = lines.findIndex((lineArg) => /[^\s;,"]/u.test(lineArg));
|
|
205
205
|
if (firstLineIndex < 0) {
|
|
206
|
-
throw refusal('the Buchungsliste has no first line naming its fields', {});
|
|
206
|
+
throw refusal('unreadable', 'the Buchungsliste has no first line naming its fields', {});
|
|
207
207
|
}
|
|
208
208
|
const delimiter = delimiterOf(lines[firstLineIndex], firstLineIndex + 1);
|
|
209
209
|
const [captionRecord, ...dataRecords] = recordsOf(text, delimiter).filter((recordArg) => !isBlank(recordArg));
|
|
210
210
|
if (captionRecord === undefined) {
|
|
211
|
-
throw refusal('the Buchungsliste has no first line naming its fields', {});
|
|
211
|
+
throw refusal('unreadable', 'the Buchungsliste has no first line naming its fields', {});
|
|
212
212
|
}
|
|
213
213
|
const captions = captionRecord.fields.map((fieldArg) => fieldArg.trim());
|
|
214
214
|
// the column of each field the first line names
|
|
@@ -224,13 +224,13 @@ export const readBuchungsliste = (bytesArg) => {
|
|
|
224
224
|
}
|
|
225
225
|
const earlier = columnOf.get(field);
|
|
226
226
|
if (earlier !== undefined) {
|
|
227
|
-
throw refusal(`line ${captionRecord.line}: columns ${earlier + 1} "${captions[earlier]}" and ${columnArg + 1} "${captionArg}" both state the ${FIELD_NAMES[field]}`, { line: captionRecord.line, field: captionArg });
|
|
227
|
+
throw refusal('unreadable', `line ${captionRecord.line}: columns ${earlier + 1} "${captions[earlier]}" and ${columnArg + 1} "${captionArg}" both state the ${FIELD_NAMES[field]}`, { line: captionRecord.line, field: captionArg });
|
|
228
228
|
}
|
|
229
229
|
columnOf.set(field, columnArg);
|
|
230
230
|
});
|
|
231
231
|
const missing = REQUIRED_FIELDS.filter((fieldArg) => !columnOf.has(fieldArg));
|
|
232
232
|
if (missing.length > 0) {
|
|
233
|
-
throw refusal(`line ${captionRecord.line}: the Buchungsliste has no column ${missing.map((fieldArg) => FIELD_NAMES[fieldArg]).join(', ')}`, {
|
|
233
|
+
throw refusal('unreadable', `line ${captionRecord.line}: the Buchungsliste has no column ${missing.map((fieldArg) => FIELD_NAMES[fieldArg]).join(', ')}`, {
|
|
234
234
|
line: captionRecord.line,
|
|
235
235
|
field: FIELD_NAMES[missing[0]],
|
|
236
236
|
});
|
|
@@ -244,13 +244,13 @@ export const readBuchungsliste = (bytesArg) => {
|
|
|
244
244
|
const row = indexArg + 1;
|
|
245
245
|
const { line } = recordArg;
|
|
246
246
|
if (recordArg.fields.length !== captions.length) {
|
|
247
|
-
throw refusal(`row ${row} (line ${line}) has ${recordArg.fields.length} fields, not the ${captions.length} of the first line`, { row, line });
|
|
247
|
+
throw refusal('unreadable', `row ${row} (line ${line}) has ${recordArg.fields.length} fields, not the ${captions.length} of the first line`, { row, line });
|
|
248
248
|
}
|
|
249
249
|
const at = (fieldArg) => {
|
|
250
250
|
const column = columnOf.get(fieldArg);
|
|
251
251
|
return column === undefined ? '' : recordArg.fields[column].trim();
|
|
252
252
|
};
|
|
253
|
-
const malformed = (fieldArg, messageArg) => refusal(`row ${row} (line ${line}): ${messageArg}`, { row, line, field: nameOf(fieldArg), value: at(fieldArg) });
|
|
253
|
+
const malformed = (fieldArg, messageArg, reasonArg = 'field_malformed') => refusal(reasonArg, `row ${row} (line ${line}): ${messageArg}`, { row, line, field: nameOf(fieldArg), value: at(fieldArg) });
|
|
254
254
|
const day = (fieldArg) => {
|
|
255
255
|
if (at(fieldArg) === '')
|
|
256
256
|
return undefined;
|
|
@@ -266,12 +266,12 @@ export const readBuchungsliste = (bytesArg) => {
|
|
|
266
266
|
};
|
|
267
267
|
for (const field of UNMAPPED_FIELDS) {
|
|
268
268
|
if (at(field) !== '') {
|
|
269
|
-
throw malformed(field, `the row states ${nameOf(field)} "${at(field)}"; this version maps no Zusatzangaben (§ 13b), EU Land or EU
|
|
269
|
+
throw malformed(field, `the row states ${nameOf(field)} "${at(field)}"; this version maps no Zusatzangaben (§ 13b), EU Land or EU %`, 'field_unmapped');
|
|
270
270
|
}
|
|
271
271
|
}
|
|
272
272
|
const currency = at('waehrung');
|
|
273
273
|
if (currency !== '' && currency !== 'EUR') {
|
|
274
|
-
throw malformed('waehrung', `the row is in ${currency}; these books are in euro
|
|
274
|
+
throw malformed('waehrung', `the row is in ${currency}; these books are in euro`, 'currency_unsupported');
|
|
275
275
|
}
|
|
276
276
|
const belegDatum = day('belegdatum');
|
|
277
277
|
if (!belegDatum)
|
|
@@ -291,7 +291,7 @@ export const readBuchungsliste = (bytesArg) => {
|
|
|
291
291
|
const habenkonto = account('habenkonto');
|
|
292
292
|
const key = at('steuerschluessel');
|
|
293
293
|
if (!plugins.skrCore.isKnownBuKey(key)) {
|
|
294
|
-
throw malformed('steuerschluessel', `the ${nameOf('steuerschluessel')} "${key}" is no DATEV key these books know (${Object.keys(plugins.skrCore.BU_KEY_RULES).join(', ')})
|
|
294
|
+
throw malformed('steuerschluessel', `the ${nameOf('steuerschluessel')} "${key}" is no DATEV key these books know (${Object.keys(plugins.skrCore.BU_KEY_RULES).join(', ')})`, 'bu_key_unknown');
|
|
295
295
|
}
|
|
296
296
|
const texts = {
|
|
297
297
|
...(at('belegnummernkreis') !== '' ? { belegnummernkreis: at('belegnummernkreis') } : {}),
|
|
@@ -370,16 +370,18 @@ export const importBuchungsliste = (bytesArg, policyArg) => {
|
|
|
370
370
|
}
|
|
371
371
|
catch (error) {
|
|
372
372
|
if (error instanceof plugins.skrCore.DatevImportError) {
|
|
373
|
-
|
|
373
|
+
// skr refuses a row's draft for a tax whose account cannot be told; any other refusal of its is a row that gives no entry
|
|
374
|
+
const reason = error.code === 'extf_tax_account_unclear' ? 'tax_account_unclear' : 'row_invalid';
|
|
375
|
+
throw refusal(reason, `row ${row} (line ${line}): ${error.message}`, { row, line });
|
|
374
376
|
}
|
|
375
377
|
throw error;
|
|
376
378
|
}
|
|
377
379
|
const validation = plugins.skrCore.validateJournalDraft(draft, policyArg);
|
|
378
380
|
if (!validation.valid) {
|
|
379
|
-
throw refusal(`row ${row} (line ${line}) gives no valid entry: ${validation.errors.join('; ')}`, { row, line, errors: validation.errors });
|
|
381
|
+
throw refusal('row_invalid', `row ${row} (line ${line}) gives no valid entry: ${validation.errors.join('; ')}`, { row, line, errors: validation.errors });
|
|
380
382
|
}
|
|
381
383
|
return { row, buchungslisteRow, datevRow, draft };
|
|
382
384
|
});
|
|
383
385
|
return { entries, warnings };
|
|
384
386
|
};
|
|
385
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/buchungsliste/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAmC,MAAM,aAAa,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EAAE,kBAAkB,EAAiE,MAAM,aAAa,CAAC;AA+ChH,6EAA6E;AAC7E,MAAM,WAAW,GAAkD;IACjE,UAAU,EAAE,YAAY;IACxB,aAAa,EAAE,eAAe;IAC9B,eAAe,EAAE,iBAAiB;IAClC,iBAAiB,EAAE,mBAAmB;IACtC,WAAW,EAAE,aAAa;IAC1B,YAAY,EAAE,cAAc;IAC5B,cAAc,EAAE,gBAAgB;IAChC,QAAQ,EAAE,SAAS;IACnB,SAAS,EAAE,WAAW;IACtB,UAAU,EAAE,YAAY;IACxB,gBAAgB,EAAE,iBAAiB;IACnC,YAAY,EAAE,cAAc;IAC5B,aAAa,EAAE,cAAc;IAC7B,aAAa,EAAE,eAAe;IAC9B,MAAM,EAAE,SAAS;IACjB,SAAS,EAAE,MAAM;CAClB,CAAC;AAEF;;;;GAIG;AACH,MAAM,eAAe,GAA6C,IAAI,GAAG,CAA8B;IACrG,CAAC,YAAY,EAAE,YAAY,CAAC;IAC5B,CAAC,eAAe,EAAE,eAAe,CAAC;IAClC,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IACtC,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAC1C,CAAC,aAAa,EAAE,aAAa,CAAC;IAC9B,CAAC,cAAc,EAAE,cAAc,CAAC;IAChC,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IACpC,CAAC,UAAU,EAAE,UAAU,CAAC;IACxB,CAAC,WAAW,EAAE,WAAW,CAAC;IAC1B,CAAC,YAAY,EAAE,YAAY,CAAC;IAC5B,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IACxC,CAAC,cAAc,EAAE,cAAc,CAAC;IAChC,CAAC,eAAe,EAAE,cAAc,CAAC;IACjC,CAAC,eAAe,EAAE,eAAe,CAAC;IAClC,CAAC,eAAe,EAAE,eAAe,CAAC;IAClC,CAAC,eAAe,EAAE,eAAe,CAAC;IAClC,CAAC,QAAQ,EAAE,QAAQ,CAAC;IACpB,CAAC,KAAK,EAAE,WAAW,CAAC;CACrB,CAAC,CAAC;AAEH,iDAAiD;AACjD,MAAM,eAAe,GAAmC,CAAC,YAAY,EAAE,gBAAgB,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;AAEpH,mJAAmJ;AACnJ,MAAM,eAAe,GAAmC,CAAC,eAAe,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;AAEjG,8HAA8H;AAC9H,MAAM,UAAU,GAAsB,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;AAEvD;;;GAGG;AACH,MAAM,WAAW,GAAG,CAAC,OAAe,EAAU,EAAE,CAC9C,OAAO;KACJ,WAAW,EAAE;KACb,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC;KACpB,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC;KACpB,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC;KACpB,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC;KACpB,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;AA2CjC,oDAAoD;AACpD,MAAM,OAAO,GAAG,CAAC,UAAkB,EAAE,UAAsC,EAAsB,EAAE,CACjG,IAAI,kBAAkB,CAAC,uBAAuB,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;AAE1E;;;;GAIG;AACH,MAAM,WAAW,GAAG,CAAC,YAAoB,EAAE,OAAe,EAAU,EAAE;IACpE,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;QAChC,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YACjB,MAAM,GAAG,CAAC,MAAM,CAAC;QACnB,CAAC;aAAM,IAAI,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;IACH,CAAC;IACD,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/E,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,OAAO,CAAC,QAAQ,OAAO,uFAAuF,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAC3I,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,SAAS,GAAG,CAAC,OAAe,EAAE,YAAoB,EAAa,EAAE;IACrE,MAAM,OAAO,GAAc,EAAE,CAAC;IAC9B,IAAI,MAAM,GAAa,EAAE,CAAC;IAC1B,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,MAAM,QAAQ,GAAG,GAAS,EAAE;QAC1B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrB,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,GAAG,KAAK,CAAC;IACjB,CAAC,CAAC;IACF,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACvD,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;QAC5B,MAAM,SAAS,GAAG,IAAI,KAAK,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;QAClF,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,IAAI,KAAK,GAAG,IAAI,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;gBAC/C,OAAO,IAAI,GAAG,CAAC;gBACf,KAAK,IAAI,CAAC,CAAC;YACb,CAAC;iBAAM,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;gBACxB,MAAM,GAAG,KAAK,CAAC;gBACf,MAAM,GAAG,IAAI,CAAC;YAChB,CAAC;iBAAM,CAAC;gBACN,OAAO,IAAI,IAAI,CAAC;gBAChB,IAAI,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;aAAM,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;YACjC,QAAQ,EAAE,CAAC;QACb,CAAC;aAAM,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAC1C,IAAI,SAAS,EAAE,CAAC;gBACd,QAAQ,EAAE,CAAC;gBACX,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;gBAC3C,MAAM,GAAG,EAAE,CAAC;gBACZ,IAAI,IAAI,CAAC,CAAC;gBACV,UAAU,GAAG,IAAI,CAAC;YACpB,CAAC;QACH,CAAC;aAAM,IAAI,MAAM,EAAE,CAAC;YAClB,MAAM,OAAO,CAAC,QAAQ,IAAI,WAAW,MAAM,CAAC,MAAM,GAAG,CAAC,mCAAmC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;QACvG,CAAC;aAAM,IAAI,IAAI,KAAK,GAAG,IAAI,OAAO,KAAK,EAAE,EAAE,CAAC;YAC1C,MAAM,GAAG,IAAI,CAAC;QAChB,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,IAAI,CAAC;QAClB,CAAC;IACH,CAAC;IACD,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,OAAO,CAAC,QAAQ,UAAU,WAAW,MAAM,CAAC,MAAM,GAAG,CAAC,qCAAqC,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;IAC3H,CAAC;IACD,+DAA+D;IAC/D,IAAI,OAAO,KAAK,EAAE,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClD,QAAQ,EAAE,CAAC;QACX,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,mFAAmF;AACnF,MAAM,OAAO,GAAG,CAAC,SAAkB,EAAW,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;AAE9G,2DAA2D;AAC3D,MAAM,KAAK,GAAG,CAAC,QAAgB,EAAoB,EAAE;IACnD,MAAM,KAAK,GAAG,8BAA8B,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5D,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClF,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IACtD,OAAO,IAAI,CAAC,cAAc,EAAE,KAAK,IAAI,IAAI,IAAI,CAAC,WAAW,EAAE,KAAK,KAAK,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;AAC5H,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,OAAO,GAAG,CAAC,QAAgB,EAAsB,EAAE;IACvD,MAAM,KAAK,GAAG,iDAAiD,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC/E,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAC3C,IAAI,KAAK,CAAC,MAAM,GAAG,EAAE;QAAE,OAAO,SAAS,CAAC;IACxC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,GAAG,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IAC5E,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;AAC3C,CAAC,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,QAAoB,EAAkB,EAAE;IACxE,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACzE,MAAM,OAAO,CAAC,+FAA+F,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;IAC9H,CAAC;IACD,MAAM,IAAI,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IACzC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IACxC,uDAAuD;IACvD,MAAM,cAAc,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IAC/E,IAAI,cAAc,GAAG,CAAC,EAAE,CAAC;QACvB,MAAM,OAAO,CAAC,uDAAuD,EAAE,EAAE,CAAC,CAAC;IAC7E,CAAC;IACD,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,CAAC,CAAC,CAAC;IACzE,MAAM,CAAC,aAAa,EAAE,GAAG,WAAW,CAAC,GAAG,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;IAC9G,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;QAChC,MAAM,OAAO,CAAC,uDAAuD,EAAE,EAAE,CAAC,CAAC;IAC7E,CAAC;IACD,MAAM,QAAQ,GAAG,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IAEzE,gDAAgD;IAChD,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA+B,CAAC;IACxD,QAAQ,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,SAAS,EAAE,EAAE;QACzC,MAAM,KAAK,GAAG,eAAe,CAAC,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC;QAC3D,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,QAAQ,CAAC,IAAI,CACX,UAAU,KAAK,EAAE;gBACf,CAAC,CAAC,UAAU,SAAS,GAAG,CAAC,uCAAuC;gBAChE,CAAC,CAAC,UAAU,SAAS,GAAG,CAAC,KAAK,UAAU,6EAA6E,CACxH,CAAC;YACF,OAAO;QACT,CAAC;QACD,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACpC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,MAAM,OAAO,CACX,QAAQ,aAAa,CAAC,IAAI,aAAa,OAAO,GAAG,CAAC,KAAK,QAAQ,CAAC,OAAO,CAAC,SAAS,SAAS,GAAG,CAAC,KAAK,UAAU,oBAAoB,WAAW,CAAC,KAAK,CAAC,EAAE,EACrJ,EAAE,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,CAChD,CAAC;QACJ,CAAC;QACD,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC9E,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,MAAM,OAAO,CAAC,QAAQ,aAAa,CAAC,IAAI,qCAAqC,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;YAC1I,IAAI,EAAE,aAAa,CAAC,IAAI;YACxB,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;SAC/B,CAAC,CAAC;IACL,CAAC;IACD,yDAAyD;IACzD,MAAM,MAAM,GAAG,CAAC,QAA6B,EAAU,EAAE;QACvD,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACtC,OAAO,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACzE,CAAC,CAAC;IAEF,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,QAAQ,EAAqB,EAAE;QACtE,MAAM,GAAG,GAAG,QAAQ,GAAG,CAAC,CAAC;QACzB,MAAM,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC;QAC3B,IAAI,SAAS,CAAC,MAAM,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,EAAE,CAAC;YAChD,MAAM,OAAO,CAAC,OAAO,GAAG,UAAU,IAAI,SAAS,SAAS,CAAC,MAAM,CAAC,MAAM,oBAAoB,QAAQ,CAAC,MAAM,oBAAoB,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;QAChJ,CAAC;QACD,MAAM,EAAE,GAAG,CAAC,QAA6B,EAAU,EAAE;YACnD,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACtC,OAAO,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;QACrE,CAAC,CAAC;QACF,MAAM,SAAS,GAAG,CAAC,QAA6B,EAAE,UAAkB,EAAsB,EAAE,CAC1F,OAAO,CAAC,OAAO,GAAG,UAAU,IAAI,MAAM,UAAU,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACnH,MAAM,GAAG,GAAG,CAAC,QAA6B,EAAoB,EAAE;YAC9D,IAAI,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE;gBAAE,OAAO,SAAS,CAAC;YAC1C,MAAM,KAAK,GAAG,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;YAClC,IAAI,CAAC,KAAK;gBAAE,MAAM,SAAS,CAAC,QAAQ,EAAE,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC;YACxG,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;QACF,MAAM,OAAO,GAAG,CAAC,QAA6B,EAAU,EAAE;YACxD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;gBAAE,MAAM,SAAS,CAAC,QAAQ,EAAE,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,yCAAyC,CAAC,CAAC;YACnJ,OAAO,EAAE,CAAC,QAAQ,CAAC,CAAC;QACtB,CAAC,CAAC;QAEF,KAAK,MAAM,KAAK,IAAI,eAAe,EAAE,CAAC;YACpC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC;gBACrB,MAAM,SAAS,CAAC,KAAK,EAAE,kBAAkB,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,gEAAgE,CAAC,CAAC;YACxI,CAAC;QACH,CAAC;QACD,MAAM,QAAQ,GAAG,EAAE,CAAC,UAAU,CAAC,CAAC;QAChC,IAAI,QAAQ,KAAK,EAAE,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;YAC1C,MAAM,SAAS,CAAC,UAAU,EAAE,iBAAiB,QAAQ,2BAA2B,CAAC,CAAC;QACpF,CAAC;QACD,MAAM,UAAU,GAAG,GAAG,CAAC,YAAY,CAAC,CAAC;QACrC,IAAI,CAAC,UAAU;YAAE,MAAM,SAAS,CAAC,YAAY,EAAE,qBAAqB,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QAC5F,MAAM,aAAa,GAAG,GAAG,CAAC,eAAe,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,EAAE,CAAC,iBAAiB,CAAC,CAAC;QACrC,IAAI,MAAM,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YAChD,MAAM,SAAS,CAAC,iBAAiB,EAAE,OAAO,MAAM,CAAC,iBAAiB,CAAC,KAAK,MAAM,iCAAiC,CAAC,CAAC;QACnH,CAAC;QACD,MAAM,WAAW,GAAG,OAAO,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAClD,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC9B,MAAM,SAAS,CACb,gBAAgB,EAChB,OAAO,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC,gBAAgB,CAAC,6GAA6G,CACtK,CAAC;QACJ,CAAC;QACD,IAAI,WAAW,KAAK,CAAC;YAAE,MAAM,SAAS,CAAC,gBAAgB,EAAE,OAAO,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;QACpI,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QACvC,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;QACzC,MAAM,GAAG,GAAG,EAAE,CAAC,kBAAkB,CAAC,CAAC;QACnC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;YACvC,MAAM,SAAS,CACb,kBAAkB,EAClB,OAAO,MAAM,CAAC,kBAAkB,CAAC,KAAK,GAAG,uCAAuC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CACxI,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,GAAG;YACZ,GAAG,CAAC,EAAE,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,EAAE,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACzF,GAAG,CAAC,EAAE,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACvE,GAAG,CAAC,EAAE,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1E,GAAG,CAAC,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC9E,CAAC;QACF,OAAO;YACL,GAAG;YACH,IAAI;YACJ,UAAU;YACV,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3C,GAAG,CAAC,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7D,YAAY,EAAE,EAAE,CAAC,cAAc,CAAC;YAChC,WAAW;YACX,SAAS;YACT,UAAU;YACV,gBAAgB,EAAE,GAAG;YACrB,GAAG,KAAK;SACT,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;AAC5B,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,YAAY,GAAG,CAAC,MAAyB,EAAsB,EAAE;IACrE,MAAM,EAAE,iBAAiB,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAClD,IAAI,iBAAiB,KAAK,SAAS,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QACjE,OAAO,WAAW,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,iBAAiB,GAAG,WAAW,EAAE,CAAC;IACxG,CAAC;IACD,OAAO,WAAW,IAAI,iBAAiB,CAAC;AAC1C,CAAC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,MAAyB,EAA2B,EAAE;IAC/F,MAAM,UAAU,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACxC,OAAO;QACL,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC;QACzC,SAAS,EAAE,MAAM,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;QAC7C,KAAK,EAAE,MAAM,CAAC,SAAS;QACvB,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,YAAY,EAAE,MAAM,CAAC,gBAAgB;QACrC,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,GAAG,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnD,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,GAAG,CAAC,MAAM,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5E,GAAG,CAAC,MAAM,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC/E,CAAC;AACJ,CAAC,CAAC;AAWF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,QAAoB,EACpB,SAAyC,EACqB,EAAE;IAChE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IACvD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,gBAAgB,EAA6B,EAAE;QACvE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,gBAAgB,CAAC;QACvC,MAAM,QAAQ,GAAG,0BAA0B,CAAC,gBAAgB,CAAC,CAAC;QAC9D,IAAI,KAAoC,CAAC;QACzC,IAAI,CAAC;YACH,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QACtE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,YAAY,OAAO,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;gBACtD,MAAM,OAAO,CAAC,OAAO,GAAG,UAAU,IAAI,MAAM,KAAK,CAAC,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;YAC9E,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;QACD,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC1E,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;YACtB,MAAM,OAAO,CAAC,OAAO,GAAG,UAAU,IAAI,2BAA2B,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;QAC7I,CAAC;QACD,OAAO,EAAE,GAAG,EAAE,gBAAgB,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IACpD,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;AAC/B,CAAC,CAAC"}
|
|
387
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/buchungsliste/index.ts"],"names":[],"mappings":"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"}
|
package/dist_ts/error.d.ts
CHANGED
|
@@ -14,11 +14,30 @@
|
|
|
14
14
|
* centres its record does not state (stored before 4.1) and no rows sent were given; the message names it;
|
|
15
15
|
* - `invalid_buchungsliste`: a Buchungsliste that cannot be read or booked as it is: no header line, a required
|
|
16
16
|
* column missing, a field that is not of its format, a field this version does not map, or a row that gives no
|
|
17
|
-
* valid entry; `details` names the line, the row and the field where it can.
|
|
17
|
+
* valid entry; `details` names why (`reason`), the line, the row and the field where it can.
|
|
18
18
|
*/
|
|
19
19
|
export type TCompatibilityErrorCode = 'invalid_bookings' | 'invalid_header' | 'export_failed' | 'invalid_documents' | 'nothing_to_correct' | 'handed_over_cost_centres_unknown' | 'invalid_buchungsliste';
|
|
20
|
+
/**
|
|
21
|
+
* Why a Buchungsliste was refused (`invalid_buchungsliste`), so a consumer can tell its user without reading the
|
|
22
|
+
* message:
|
|
23
|
+
* - `unreadable`: the text is no list of rows of the first line's fields: a byte order mark of UTF-8, no first line,
|
|
24
|
+
* no delimiter, a quote never closed or text after a closing quote, a required column missing or two columns of
|
|
25
|
+
* one field, a row of another number of fields;
|
|
26
|
+
* - `field_malformed`: a field not of its format (a day, an amount or 0, an account, a Buchungsperiode), or no
|
|
27
|
+
* Belegdatum;
|
|
28
|
+
* - `field_unmapped`: a row that states Zusatzangaben, an EU Land or an EU %, which this version does not map;
|
|
29
|
+
* - `currency_unsupported`: a Währung other than EUR;
|
|
30
|
+
* - `bu_key_unknown`: a Steuerschlüssel `@fin.cx/skr` does not know;
|
|
31
|
+
* - `tax_account_unclear`: a row with a tax where the account it is computed on cannot be told (skr's
|
|
32
|
+
* `extf_tax_account_unclear`);
|
|
33
|
+
* - `row_invalid`: a row whose entry skr refuses otherwise; where its check (`validateJournalDraft`) refused it, what
|
|
34
|
+
* the check found in `details.errors`.
|
|
35
|
+
*/
|
|
36
|
+
export type TBuchungslisteRefusalReason = 'unreadable' | 'field_malformed' | 'field_unmapped' | 'currency_unsupported' | 'bu_key_unknown' | 'tax_account_unclear' | 'row_invalid';
|
|
20
37
|
/** Where a refusal of a file read stands, as far as it is known; empty for a file written. */
|
|
21
38
|
export interface ICompatibilityErrorDetails {
|
|
39
|
+
/** why a Buchungsliste was refused; stated on every `invalid_buchungsliste` */
|
|
40
|
+
reason?: TBuchungslisteRefusalReason;
|
|
22
41
|
/** the data row, from 1 */
|
|
23
42
|
row?: number;
|
|
24
43
|
/** the line of the file, from 1 */
|
package/dist_ts/error.js
CHANGED
|
@@ -6,4 +6,4 @@ export class CompatibilityError extends Error {
|
|
|
6
6
|
this.details = detailsArg;
|
|
7
7
|
}
|
|
8
8
|
}
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9lcnJvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFvRUEsTUFBTSxPQUFPLGtCQUFtQixTQUFRLEtBQUs7SUFJM0MsWUFBWSxPQUFnQyxFQUFFLFVBQWtCLEVBQUUsYUFBeUMsRUFBRTtRQUMzRyxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDbEIsSUFBSSxDQUFDLElBQUksR0FBRyxvQkFBb0IsQ0FBQztRQUNqQyxJQUFJLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQztRQUNwQixJQUFJLENBQUMsT0FBTyxHQUFHLFVBQVUsQ0FBQztJQUM1QixDQUFDO0NBQ0YifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fin.cx/compatibility",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.3.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Exchange formats of third-party accounting systems: the EXTF Buchungsstapel in Windows-1252 on the rows of @fin.cx/skr, the document-image archive (document.xml and ZIP), and a payroll program's Buchungsliste read into journal drafts",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
53
53
|
"@fin.cx/skr": "^8.0.0",
|
|
54
|
-
"@git.zone/tsbuild": "^5.
|
|
54
|
+
"@git.zone/tsbuild": "^5.2.0",
|
|
55
55
|
"@git.zone/tsrun": "^3.0.2",
|
|
56
56
|
"@git.zone/tstest": "^7.2.0",
|
|
57
57
|
"@types/node": "^26.6.3"
|
package/readme.md
CHANGED
|
@@ -124,14 +124,17 @@ How a row is read:
|
|
|
124
124
|
- **Kept, not booked**: the Buchungsdatum and the Buchungsperiode stand on the row (`buchungsDatum`, `buchungsperiode`); a draft is dated by its Belegdatum, as a Buchungsstapel row is.
|
|
125
125
|
- **The chart is your skr's.** skr 8's SKR 03 knows 8611 "Verrechnete sonstige Sachbezüge aus Fahrzeug-Gestellung 19 % USt" as an Automatikkonto at 19 %: a company car's row onto it without a key books the VAT out of the amount. skr 7 knows 8611 as no Automatikkonto, and the same row books no VAT.
|
|
126
126
|
|
|
127
|
-
Refused with `CompatibilityError` `invalid_buchungsliste`, the message naming the line and the row, and `details` the `line`, the `row`, the `field` (its column's name as the file states it) and its `value`:
|
|
128
|
-
|
|
129
|
-
- a file that begins with the byte order mark of UTF-8, or has no first line; a first line whose names are separated by none of semicolon, tab and comma;
|
|
130
|
-
- a
|
|
131
|
-
-
|
|
132
|
-
-
|
|
133
|
-
- a row that states Zusatzangaben, an EU Land or an EU %: this version maps none of them (the § 13b and OSS cases need a decision it does not make);
|
|
134
|
-
- the first row skr cannot book
|
|
127
|
+
Refused with `CompatibilityError` `invalid_buchungsliste`, the message naming the line and the row, and `details` why (`reason`, `TBuchungslisteRefusalReason`), the `line`, the `row`, the `field` (its column's name as the file states it) and its `value`:
|
|
128
|
+
|
|
129
|
+
- `unreadable`: a file that begins with the byte order mark of UTF-8, or has no first line; a first line whose names are separated by none of semicolon, tab and comma; a required column missing (Belegdatum, Buchungsbetrag, Sollkonto, Habenkonto), each named, or two columns of one field; a row of another number of fields than the first line; a quote never closed, or text after a closing quote;
|
|
130
|
+
- `field_malformed`: a day not TT.MM.JJJJ (or none in the Belegdatum); an amount that is not digits with, if any, a decimal comma and at most 2 decimals, at most 10 digits before it (dots may group the thousands, a minus sign may lead it), or 0; an account not of 1 to 9 digits; a Buchungsperiode not of 1 or 2 digits;
|
|
131
|
+
- `bu_key_unknown`: a Steuerschlüssel skr does not know;
|
|
132
|
+
- `currency_unsupported`: a Währung other than EUR (or empty);
|
|
133
|
+
- `field_unmapped`: a row that states Zusatzangaben, an EU Land or an EU %: this version maps none of them (the § 13b and OSS cases need a decision it does not make);
|
|
134
|
+
- `tax_account_unclear`: the first row skr cannot book, a tax whose account cannot be told;
|
|
135
|
+
- `row_invalid`: the first row whose draft skr's check refuses (`details.errors`).
|
|
136
|
+
|
|
137
|
+
The `reason` lets a consumer tell its user why without the message, which states the file's values.
|
|
135
138
|
|
|
136
139
|
**Unconfirmed until a real export of lohn+gehalt has been read.** No such export has been seen. The field names lohn+gehalt writes in the first line (a secondary source names `Belegdatum;Belegnummer;Buchungstext;Buchungsbetrag;Währung;Sollkonto;Habenkonto;Kostenstelle 1`), the delimiter, the quoting and the line ending are not known; hence the reader takes the columns by name and the delimiter from the first line (the first of semicolon, tab and comma outside quotes), takes a field in double quotes with a quote written twice inside, a line break inside quotes, lines ending in CRLF, LF or CR, and skips a line that states nothing. Unconfirmed as well: that "Kostenstelle 2" is the second cost-centre level (KOST2), how the file writes an empty numeric field (a `0` in Zusatzangaben or EU % is refused, as any value there) and a Steuerschlüssel (written with a leading zero, `09`, or as `0`, it is refused), whether the Belegnummer already holds the Nummernkreis, whether a Währung column is written as `EUR`, and whether amounts are ever negative.
|
|
137
140
|
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@fin.cx/compatibility',
|
|
6
|
-
version: '5.
|
|
6
|
+
version: '5.3.0',
|
|
7
7
|
description: 'Exchange formats of third-party accounting systems: the EXTF Buchungsstapel in Windows-1252 on the rows of @fin.cx/skr, the document-image archive (document.xml and ZIP), and a payroll program\'s Buchungsliste read into journal drafts'
|
|
8
8
|
}
|
|
@@ -1,8 +1,13 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
|
-
import { CompatibilityError, type ICompatibilityErrorDetails } from '../error.js';
|
|
2
|
+
import { CompatibilityError, type ICompatibilityErrorDetails, type TBuchungslisteRefusalReason } from '../error.js';
|
|
3
3
|
import { decodeWindows1252 } from '../encoding/index.js';
|
|
4
4
|
|
|
5
|
-
export {
|
|
5
|
+
export {
|
|
6
|
+
CompatibilityError,
|
|
7
|
+
type TCompatibilityErrorCode,
|
|
8
|
+
type ICompatibilityErrorDetails,
|
|
9
|
+
type TBuchungslisteRefusalReason,
|
|
10
|
+
} from '../error.js';
|
|
6
11
|
|
|
7
12
|
export type IDatevBuchungsstapelRow = plugins.skrCore.IDatevBuchungsstapelRow;
|
|
8
13
|
|
|
@@ -158,9 +163,12 @@ interface IRecord {
|
|
|
158
163
|
fields: string[];
|
|
159
164
|
}
|
|
160
165
|
|
|
161
|
-
/** A Buchungsliste that cannot be read as it is. */
|
|
162
|
-
const refusal = (
|
|
163
|
-
|
|
166
|
+
/** A Buchungsliste that cannot be read as it is, and why. */
|
|
167
|
+
const refusal = (
|
|
168
|
+
reasonArg: TBuchungslisteRefusalReason,
|
|
169
|
+
messageArg: string,
|
|
170
|
+
detailsArg: Omit<ICompatibilityErrorDetails, 'reason'>,
|
|
171
|
+
): CompatibilityError => new CompatibilityError('invalid_buchungsliste', messageArg, { reason: reasonArg, ...detailsArg });
|
|
164
172
|
|
|
165
173
|
/**
|
|
166
174
|
* The delimiter the first line separates its names by: the first of semicolon, tab and comma that stands in it outside
|
|
@@ -179,7 +187,7 @@ const delimiterOf = (firstLineArg: string, lineArg: number): string => {
|
|
|
179
187
|
}
|
|
180
188
|
const delimiter = DELIMITERS.find((delimiterArg) => outside.has(delimiterArg));
|
|
181
189
|
if (delimiter === undefined) {
|
|
182
|
-
throw refusal(`line ${lineArg}: the field names of the first line are separated by none of semicolon, tab and comma`, { line: lineArg });
|
|
190
|
+
throw refusal('unreadable', `line ${lineArg}: the field names of the first line are separated by none of semicolon, tab and comma`, { line: lineArg });
|
|
183
191
|
}
|
|
184
192
|
return delimiter;
|
|
185
193
|
};
|
|
@@ -228,7 +236,7 @@ const recordsOf = (textArg: string, delimiterArg: string): IRecord[] => {
|
|
|
228
236
|
recordLine = line;
|
|
229
237
|
}
|
|
230
238
|
} else if (closed) {
|
|
231
|
-
throw refusal(`line ${line}: field ${fields.length + 1} has text after its closing quote`, { line });
|
|
239
|
+
throw refusal('unreadable', `line ${line}: field ${fields.length + 1} has text after its closing quote`, { line });
|
|
232
240
|
} else if (char === '"' && current === '') {
|
|
233
241
|
quoted = true;
|
|
234
242
|
} else {
|
|
@@ -236,7 +244,7 @@ const recordsOf = (textArg: string, delimiterArg: string): IRecord[] => {
|
|
|
236
244
|
}
|
|
237
245
|
}
|
|
238
246
|
if (quoted) {
|
|
239
|
-
throw refusal(`line ${recordLine}: field ${fields.length + 1} opens a quote that is never closed`, { line: recordLine });
|
|
247
|
+
throw refusal('unreadable', `line ${recordLine}: field ${fields.length + 1} opens a quote that is never closed`, { line: recordLine });
|
|
240
248
|
}
|
|
241
249
|
// the last record, where the text does not end in a line break
|
|
242
250
|
if (current !== '' || closed || fields.length > 0) {
|
|
@@ -287,19 +295,19 @@ const centsOf = (valueArg: string): number | undefined => {
|
|
|
287
295
|
*/
|
|
288
296
|
export const readBuchungsliste = (bytesArg: Uint8Array): IBuchungsliste => {
|
|
289
297
|
if (bytesArg[0] === 0xef && bytesArg[1] === 0xbb && bytesArg[2] === 0xbf) {
|
|
290
|
-
throw refusal('the Buchungsliste begins with the byte order mark of UTF-8; it is read as Windows-1252 (ANSI)', { line: 1 });
|
|
298
|
+
throw refusal('unreadable', 'the Buchungsliste begins with the byte order mark of UTF-8; it is read as Windows-1252 (ANSI)', { line: 1 });
|
|
291
299
|
}
|
|
292
300
|
const text = decodeWindows1252(bytesArg);
|
|
293
301
|
const lines = text.split(/\r\n|\n|\r/u);
|
|
294
302
|
// the first line that states anything names the fields
|
|
295
303
|
const firstLineIndex = lines.findIndex((lineArg) => /[^\s;,"]/u.test(lineArg));
|
|
296
304
|
if (firstLineIndex < 0) {
|
|
297
|
-
throw refusal('the Buchungsliste has no first line naming its fields', {});
|
|
305
|
+
throw refusal('unreadable', 'the Buchungsliste has no first line naming its fields', {});
|
|
298
306
|
}
|
|
299
307
|
const delimiter = delimiterOf(lines[firstLineIndex], firstLineIndex + 1);
|
|
300
308
|
const [captionRecord, ...dataRecords] = recordsOf(text, delimiter).filter((recordArg) => !isBlank(recordArg));
|
|
301
309
|
if (captionRecord === undefined) {
|
|
302
|
-
throw refusal('the Buchungsliste has no first line naming its fields', {});
|
|
310
|
+
throw refusal('unreadable', 'the Buchungsliste has no first line naming its fields', {});
|
|
303
311
|
}
|
|
304
312
|
const captions = captionRecord.fields.map((fieldArg) => fieldArg.trim());
|
|
305
313
|
|
|
@@ -319,6 +327,7 @@ export const readBuchungsliste = (bytesArg: Uint8Array): IBuchungsliste => {
|
|
|
319
327
|
const earlier = columnOf.get(field);
|
|
320
328
|
if (earlier !== undefined) {
|
|
321
329
|
throw refusal(
|
|
330
|
+
'unreadable',
|
|
322
331
|
`line ${captionRecord.line}: columns ${earlier + 1} "${captions[earlier]}" and ${columnArg + 1} "${captionArg}" both state the ${FIELD_NAMES[field]}`,
|
|
323
332
|
{ line: captionRecord.line, field: captionArg },
|
|
324
333
|
);
|
|
@@ -327,7 +336,7 @@ export const readBuchungsliste = (bytesArg: Uint8Array): IBuchungsliste => {
|
|
|
327
336
|
});
|
|
328
337
|
const missing = REQUIRED_FIELDS.filter((fieldArg) => !columnOf.has(fieldArg));
|
|
329
338
|
if (missing.length > 0) {
|
|
330
|
-
throw refusal(`line ${captionRecord.line}: the Buchungsliste has no column ${missing.map((fieldArg) => FIELD_NAMES[fieldArg]).join(', ')}`, {
|
|
339
|
+
throw refusal('unreadable', `line ${captionRecord.line}: the Buchungsliste has no column ${missing.map((fieldArg) => FIELD_NAMES[fieldArg]).join(', ')}`, {
|
|
331
340
|
line: captionRecord.line,
|
|
332
341
|
field: FIELD_NAMES[missing[0]],
|
|
333
342
|
});
|
|
@@ -342,14 +351,17 @@ export const readBuchungsliste = (bytesArg: Uint8Array): IBuchungsliste => {
|
|
|
342
351
|
const row = indexArg + 1;
|
|
343
352
|
const { line } = recordArg;
|
|
344
353
|
if (recordArg.fields.length !== captions.length) {
|
|
345
|
-
throw refusal(`row ${row} (line ${line}) has ${recordArg.fields.length} fields, not the ${captions.length} of the first line`, { row, line });
|
|
354
|
+
throw refusal('unreadable', `row ${row} (line ${line}) has ${recordArg.fields.length} fields, not the ${captions.length} of the first line`, { row, line });
|
|
346
355
|
}
|
|
347
356
|
const at = (fieldArg: TBuchungslisteField): string => {
|
|
348
357
|
const column = columnOf.get(fieldArg);
|
|
349
358
|
return column === undefined ? '' : recordArg.fields[column].trim();
|
|
350
359
|
};
|
|
351
|
-
const malformed = (
|
|
352
|
-
|
|
360
|
+
const malformed = (
|
|
361
|
+
fieldArg: TBuchungslisteField,
|
|
362
|
+
messageArg: string,
|
|
363
|
+
reasonArg: TBuchungslisteRefusalReason = 'field_malformed',
|
|
364
|
+
): CompatibilityError => refusal(reasonArg, `row ${row} (line ${line}): ${messageArg}`, { row, line, field: nameOf(fieldArg), value: at(fieldArg) });
|
|
353
365
|
const day = (fieldArg: TBuchungslisteField): Date | undefined => {
|
|
354
366
|
if (at(fieldArg) === '') return undefined;
|
|
355
367
|
const value = dayOf(at(fieldArg));
|
|
@@ -363,12 +375,12 @@ export const readBuchungsliste = (bytesArg: Uint8Array): IBuchungsliste => {
|
|
|
363
375
|
|
|
364
376
|
for (const field of UNMAPPED_FIELDS) {
|
|
365
377
|
if (at(field) !== '') {
|
|
366
|
-
throw malformed(field, `the row states ${nameOf(field)} "${at(field)}"; this version maps no Zusatzangaben (§ 13b), EU Land or EU
|
|
378
|
+
throw malformed(field, `the row states ${nameOf(field)} "${at(field)}"; this version maps no Zusatzangaben (§ 13b), EU Land or EU %`, 'field_unmapped');
|
|
367
379
|
}
|
|
368
380
|
}
|
|
369
381
|
const currency = at('waehrung');
|
|
370
382
|
if (currency !== '' && currency !== 'EUR') {
|
|
371
|
-
throw malformed('waehrung', `the row is in ${currency}; these books are in euro
|
|
383
|
+
throw malformed('waehrung', `the row is in ${currency}; these books are in euro`, 'currency_unsupported');
|
|
372
384
|
}
|
|
373
385
|
const belegDatum = day('belegdatum');
|
|
374
386
|
if (!belegDatum) throw malformed('belegdatum', `the row states no ${nameOf('belegdatum')}`);
|
|
@@ -392,6 +404,7 @@ export const readBuchungsliste = (bytesArg: Uint8Array): IBuchungsliste => {
|
|
|
392
404
|
throw malformed(
|
|
393
405
|
'steuerschluessel',
|
|
394
406
|
`the ${nameOf('steuerschluessel')} "${key}" is no DATEV key these books know (${Object.keys(plugins.skrCore.BU_KEY_RULES).join(', ')})`,
|
|
407
|
+
'bu_key_unknown',
|
|
395
408
|
);
|
|
396
409
|
}
|
|
397
410
|
const texts = {
|
|
@@ -485,13 +498,15 @@ export const importBuchungsliste = (
|
|
|
485
498
|
draft = plugins.skrCore.journalDraftOfDatevRow(datevRow, policyArg);
|
|
486
499
|
} catch (error) {
|
|
487
500
|
if (error instanceof plugins.skrCore.DatevImportError) {
|
|
488
|
-
|
|
501
|
+
// skr refuses a row's draft for a tax whose account cannot be told; any other refusal of its is a row that gives no entry
|
|
502
|
+
const reason = error.code === 'extf_tax_account_unclear' ? 'tax_account_unclear' : 'row_invalid';
|
|
503
|
+
throw refusal(reason, `row ${row} (line ${line}): ${error.message}`, { row, line });
|
|
489
504
|
}
|
|
490
505
|
throw error;
|
|
491
506
|
}
|
|
492
507
|
const validation = plugins.skrCore.validateJournalDraft(draft, policyArg);
|
|
493
508
|
if (!validation.valid) {
|
|
494
|
-
throw refusal(`row ${row} (line ${line}) gives no valid entry: ${validation.errors.join('; ')}`, { row, line, errors: validation.errors });
|
|
509
|
+
throw refusal('row_invalid', `row ${row} (line ${line}) gives no valid entry: ${validation.errors.join('; ')}`, { row, line, errors: validation.errors });
|
|
495
510
|
}
|
|
496
511
|
return { row, buchungslisteRow, datevRow, draft };
|
|
497
512
|
});
|
package/ts/error.ts
CHANGED
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* centres its record does not state (stored before 4.1) and no rows sent were given; the message names it;
|
|
15
15
|
* - `invalid_buchungsliste`: a Buchungsliste that cannot be read or booked as it is: no header line, a required
|
|
16
16
|
* column missing, a field that is not of its format, a field this version does not map, or a row that gives no
|
|
17
|
-
* valid entry; `details` names the line, the row and the field where it can.
|
|
17
|
+
* valid entry; `details` names why (`reason`), the line, the row and the field where it can.
|
|
18
18
|
*/
|
|
19
19
|
export type TCompatibilityErrorCode =
|
|
20
20
|
| 'invalid_bookings'
|
|
@@ -25,8 +25,35 @@ export type TCompatibilityErrorCode =
|
|
|
25
25
|
| 'handed_over_cost_centres_unknown'
|
|
26
26
|
| 'invalid_buchungsliste';
|
|
27
27
|
|
|
28
|
+
/**
|
|
29
|
+
* Why a Buchungsliste was refused (`invalid_buchungsliste`), so a consumer can tell its user without reading the
|
|
30
|
+
* message:
|
|
31
|
+
* - `unreadable`: the text is no list of rows of the first line's fields: a byte order mark of UTF-8, no first line,
|
|
32
|
+
* no delimiter, a quote never closed or text after a closing quote, a required column missing or two columns of
|
|
33
|
+
* one field, a row of another number of fields;
|
|
34
|
+
* - `field_malformed`: a field not of its format (a day, an amount or 0, an account, a Buchungsperiode), or no
|
|
35
|
+
* Belegdatum;
|
|
36
|
+
* - `field_unmapped`: a row that states Zusatzangaben, an EU Land or an EU %, which this version does not map;
|
|
37
|
+
* - `currency_unsupported`: a Währung other than EUR;
|
|
38
|
+
* - `bu_key_unknown`: a Steuerschlüssel `@fin.cx/skr` does not know;
|
|
39
|
+
* - `tax_account_unclear`: a row with a tax where the account it is computed on cannot be told (skr's
|
|
40
|
+
* `extf_tax_account_unclear`);
|
|
41
|
+
* - `row_invalid`: a row whose entry skr refuses otherwise; where its check (`validateJournalDraft`) refused it, what
|
|
42
|
+
* the check found in `details.errors`.
|
|
43
|
+
*/
|
|
44
|
+
export type TBuchungslisteRefusalReason =
|
|
45
|
+
| 'unreadable'
|
|
46
|
+
| 'field_malformed'
|
|
47
|
+
| 'field_unmapped'
|
|
48
|
+
| 'currency_unsupported'
|
|
49
|
+
| 'bu_key_unknown'
|
|
50
|
+
| 'tax_account_unclear'
|
|
51
|
+
| 'row_invalid';
|
|
52
|
+
|
|
28
53
|
/** Where a refusal of a file read stands, as far as it is known; empty for a file written. */
|
|
29
54
|
export interface ICompatibilityErrorDetails {
|
|
55
|
+
/** why a Buchungsliste was refused; stated on every `invalid_buchungsliste` */
|
|
56
|
+
reason?: TBuchungslisteRefusalReason;
|
|
30
57
|
/** the data row, from 1 */
|
|
31
58
|
row?: number;
|
|
32
59
|
/** the line of the file, from 1 */
|