@tasenor/common-node 1.11.25 → 1.11.26
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.
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { KnexDatabase } from '..';
|
|
2
|
-
import { ParsedTsvFileData, BookkeeperConfig, DirectoryPath, TsvFilePath, JsonFilePath,
|
|
2
|
+
import { ParsedTsvFileData, BookkeeperConfig, DirectoryPath, TsvFilePath, JsonFilePath, TarFilePath, ProcessModelDetailedData, ImporterModelData } from '@tasenor/common';
|
|
3
3
|
/**
|
|
4
4
|
* Common functionality for exporters.
|
|
5
5
|
*/
|
|
@@ -60,7 +60,7 @@ export declare class Exporter {
|
|
|
60
60
|
* @param path Output file path.
|
|
61
61
|
* @param lines Data content.
|
|
62
62
|
*/
|
|
63
|
-
writeJson(jsonPath: JsonFilePath, data:
|
|
63
|
+
writeJson(jsonPath: JsonFilePath, data: unknown): void;
|
|
64
64
|
/**
|
|
65
65
|
* Save complete backup of the Sqlite database to the given directory.
|
|
66
66
|
* @param db Database connection.
|
|
@@ -121,13 +121,11 @@ export class Exporter {
|
|
|
121
121
|
for (const importer of importers) {
|
|
122
122
|
const importerDir = create(path.join(out, 'importers', importer.name));
|
|
123
123
|
const importerPath = create(path.join(importerDir, 'config.json'));
|
|
124
|
-
// TODO: Need type improvements.
|
|
125
124
|
this.writeJson(importerPath, importer.config);
|
|
126
125
|
}
|
|
127
126
|
for (const imp of imports) {
|
|
128
127
|
const importDir = create(path.join(out, 'importers', imp.ownerId + ''));
|
|
129
128
|
const importPath = create(path.join(importDir, imp.created + '.json'));
|
|
130
|
-
// TODO: Need type improvements.
|
|
131
129
|
this.writeJson(importPath, { ...imp, ownerId: undefined });
|
|
132
130
|
}
|
|
133
131
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Exporter.js","sourceRoot":"","sources":["../../../src/export/Exporter.ts"],"names":[],"mappings":"AAAA,sDAAsD;AACtD,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,OAAO,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"Exporter.js","sourceRoot":"","sources":["../../../src/export/Exporter.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tasenor/common-node",
|
|
3
|
-
"version": "1.11.
|
|
3
|
+
"version": "1.11.26",
|
|
4
4
|
"description": "Common Node-parts of Tasenor project",
|
|
5
5
|
"main": "src/index.ts",
|
|
6
6
|
"types": "src/index.ts",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"sqlite3": "^5.1.7",
|
|
36
36
|
"tar": "^6.2.0",
|
|
37
37
|
"ts-opaque": "^3.0.1",
|
|
38
|
-
"@tasenor/common": "1.11.
|
|
38
|
+
"@tasenor/common": "1.11.26"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
41
|
"@jest/globals": "^29.7.0",
|
|
@@ -44,8 +44,8 @@
|
|
|
44
44
|
"jest": "^29.7.0",
|
|
45
45
|
"ts-jest": "^29.1.2",
|
|
46
46
|
"typescript": "^5.3.3",
|
|
47
|
-
"
|
|
48
|
-
"
|
|
47
|
+
"eslint-config-tasenor": "0.0.0",
|
|
48
|
+
"@tasenor/config": "1.11.26"
|
|
49
49
|
},
|
|
50
50
|
"scripts": {
|
|
51
51
|
"ci": "pnpm run lint && pnpm run test",
|
package/src/export/Exporter.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import path from 'path'
|
|
3
3
|
import fs from 'fs'
|
|
4
4
|
import { KnexDatabase } from '..'
|
|
5
|
-
import { log, ParsedTsvFileData, BookkeeperConfig, DirectoryPath, TsvFilePath, JsonFilePath,
|
|
5
|
+
import { log, ParsedTsvFileData, BookkeeperConfig, DirectoryPath, TsvFilePath, JsonFilePath, TarFilePath, ProcessModelDetailedData, ImporterModelData, FilePath } from '@tasenor/common'
|
|
6
6
|
import { create } from 'ts-opaque'
|
|
7
7
|
import { system } from '../system'
|
|
8
8
|
import dayjs from 'dayjs'
|
|
@@ -97,7 +97,7 @@ export class Exporter {
|
|
|
97
97
|
* @param path Output file path.
|
|
98
98
|
* @param lines Data content.
|
|
99
99
|
*/
|
|
100
|
-
writeJson(jsonPath: JsonFilePath, data:
|
|
100
|
+
writeJson(jsonPath: JsonFilePath, data: unknown): void {
|
|
101
101
|
log(`Writing ${jsonPath}`)
|
|
102
102
|
if (!fs.existsSync(path.dirname(jsonPath))) {
|
|
103
103
|
fs.mkdirSync(path.dirname(jsonPath), { recursive: true })
|
|
@@ -120,7 +120,7 @@ export class Exporter {
|
|
|
120
120
|
log(`Saving file format version ${this.VERSION}.`)
|
|
121
121
|
this.writeJson(create(path.join(out, 'VERSION')), this.VERSION)
|
|
122
122
|
const conf = await this.getConfig(db)
|
|
123
|
-
this.writeJson(create(path.join(out, 'settings.json')), conf
|
|
123
|
+
this.writeJson(create(path.join(out, 'settings.json')), conf)
|
|
124
124
|
const accounts = await this.getAccounts(db)
|
|
125
125
|
this.writeTsv(create(path.join(accountDir, 'fi-EUR.tsv')), accounts)
|
|
126
126
|
const periods = await this.getPeriods(db)
|
|
@@ -136,14 +136,12 @@ export class Exporter {
|
|
|
136
136
|
for (const importer of importers) {
|
|
137
137
|
const importerDir: DirectoryPath = create(path.join(out, 'importers', importer.name))
|
|
138
138
|
const importerPath: FilePath = create(path.join(importerDir, 'config.json'))
|
|
139
|
-
|
|
140
|
-
this.writeJson(importerPath, importer.config as Value)
|
|
139
|
+
this.writeJson(importerPath, importer.config)
|
|
141
140
|
}
|
|
142
141
|
for (const imp of imports) {
|
|
143
142
|
const importDir: DirectoryPath = create(path.join(out, 'importers', imp.ownerId + ''))
|
|
144
143
|
const importPath: FilePath = create(path.join(importDir, imp.created + '.json'))
|
|
145
|
-
|
|
146
|
-
this.writeJson(importPath, { ...imp, ownerId: undefined } as unknown as Value)
|
|
144
|
+
this.writeJson(importPath, { ...imp, ownerId: undefined })
|
|
147
145
|
}
|
|
148
146
|
}
|
|
149
147
|
|