@nsshunt/stsdatamanagement 1.18.177 → 1.18.178
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/cliworker.js +4 -4
- package/dist/cliworker.js.map +1 -1
- package/dist/dalUserManager.js +6 -6
- package/dist/dalUserManager.js.map +1 -1
- package/dist/dalUserManager.test.js +9 -9
- package/dist/dalUserManager.test.js.map +1 -1
- package/dist/databaseutils.js +9 -9
- package/dist/databaseutils.js.map +1 -1
- package/dist/datagenerator.js +2 -2
- package/dist/datagenerator.js.map +1 -1
- package/dist/dbAccessLayerManager.js +4 -4
- package/dist/dbAccessLayerManager.js.map +1 -1
- package/dist/dbaccess.js +7 -7
- package/dist/dbaccess.js.map +1 -1
- package/dist/dbbuild.test.js +6 -6
- package/dist/dbbuild.test.js.map +1 -1
- package/dist/pcaccesslayer-entity.test.js +31 -31
- package/dist/pcaccesslayer-entity.test.js.map +1 -1
- package/dist/pcaccesslayer.test.js +40 -40
- package/dist/pcaccesslayer.test.js.map +1 -1
- package/dist/pgaccesslayer.js +86 -86
- package/dist/pgaccesslayer.js.map +1 -1
- package/dist/pgpoolmanager.js +2 -2
- package/dist/pgpoolmanager.js.map +1 -1
- package/dist/pgutils.js +6 -6
- package/dist/pgutils.js.map +1 -1
- package/dist/setupdb.js +2 -2
- package/dist/setupdb.js.map +1 -1
- package/package.json +2 -1
- package/types/dalUserManager.d.ts +1 -1
- package/types/dalUserManager.d.ts.map +1 -1
- package/types/databaseutils.d.ts +1 -1
- package/types/databaseutils.d.ts.map +1 -1
- package/types/datagenerator.d.ts +2 -2
- package/types/datagenerator.d.ts.map +1 -1
- package/types/dbAccessLayerManager.d.ts +1 -1
- package/types/dbAccessLayerManager.d.ts.map +1 -1
- package/types/dbaccess.d.ts +7 -7
- package/types/dbaccess.d.ts.map +1 -1
- package/types/pgaccesslayer-old.d.ts +1 -1
- package/types/pgaccesslayer-old.d.ts.map +1 -1
- package/types/pgaccesslayer.d.ts +1 -1
- package/types/pgaccesslayer.d.ts.map +1 -1
- package/types/pgutils.d.ts.map +1 -1
- package/types/setupdb.d.ts +1 -1
- package/types/setupdb.d.ts.map +1 -1
package/dist/cliworker.js
CHANGED
|
@@ -8,8 +8,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
8
8
|
exports.CliWorker = void 0;
|
|
9
9
|
//import { parentPort } from 'node:worker_threads';
|
|
10
10
|
const crypto_1 = __importDefault(require("crypto"));
|
|
11
|
-
const
|
|
12
|
-
const
|
|
11
|
+
const pgpoolmanager_js_1 = require("./pgpoolmanager.js");
|
|
12
|
+
const pgaccesslayer_old_js_1 = require("./pgaccesslayer-old.js");
|
|
13
13
|
/*
|
|
14
14
|
const { parentPort, workerData } = require('node:worker_threads');
|
|
15
15
|
//require('node:crypto');
|
|
@@ -34,8 +34,8 @@ class CliWorker {
|
|
|
34
34
|
Run = async () => {
|
|
35
35
|
let datamax = this.#options.datamax;
|
|
36
36
|
let count = this.#options.start;
|
|
37
|
-
const accesslayer = new
|
|
38
|
-
poolManager: new
|
|
37
|
+
const accesslayer = new pgaccesslayer_old_js_1.PGAccessLayer({
|
|
38
|
+
poolManager: new pgpoolmanager_js_1.PGPoolManager({
|
|
39
39
|
usedefaultdb: false,
|
|
40
40
|
logger: this.#options.logger
|
|
41
41
|
}),
|
package/dist/cliworker.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cliworker.js","sourceRoot":"","sources":["../src/cliworker.ts"],"names":[],"mappings":";AAAA,6FAA6F;AAC7F,+BAA+B;;;;;;AAE/B,mDAAmD;AACnD,oDAA4B;AAE5B,
|
|
1
|
+
{"version":3,"file":"cliworker.js","sourceRoot":"","sources":["../src/cliworker.ts"],"names":[],"mappings":"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"}
|
package/dist/dalUserManager.js
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DALUserManager = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
4
|
+
const commonTypes_js_1 = require("./commonTypes.js");
|
|
5
|
+
const dbAccessLayerManager_js_1 = require("./dbAccessLayerManager.js");
|
|
6
6
|
class DALUserManager {
|
|
7
7
|
#accessLayer;
|
|
8
8
|
#userResource;
|
|
9
9
|
constructor(options) {
|
|
10
|
-
this.#accessLayer = new
|
|
10
|
+
this.#accessLayer = new dbAccessLayerManager_js_1.DBAccessLayerManager().CreateAccessLayer({
|
|
11
11
|
accessLayerType: options.accessLayerType,
|
|
12
12
|
accessLayerOptions: options.accessLayerOptions
|
|
13
13
|
});
|
|
@@ -57,7 +57,7 @@ class DALUserManager {
|
|
|
57
57
|
const userResource = await this.#GetUserResource();
|
|
58
58
|
const retVal = await this.#accessLayer.CreateEntity({
|
|
59
59
|
filters: {
|
|
60
|
-
dbactionuser:
|
|
60
|
+
dbactionuser: commonTypes_js_1.SYSTEM_USER_ID,
|
|
61
61
|
resname: userResource.resname,
|
|
62
62
|
entname: user.name
|
|
63
63
|
}
|
|
@@ -76,7 +76,7 @@ class DALUserManager {
|
|
|
76
76
|
const userResource = await this.#GetUserResource();
|
|
77
77
|
const retVal = await this.#accessLayer.UpdateEntity({
|
|
78
78
|
filters: {
|
|
79
|
-
dbactionuser:
|
|
79
|
+
dbactionuser: commonTypes_js_1.SYSTEM_USER_ID,
|
|
80
80
|
resname: userResource.resname,
|
|
81
81
|
entname: user.name
|
|
82
82
|
}
|
|
@@ -95,7 +95,7 @@ class DALUserManager {
|
|
|
95
95
|
const userResource = await this.#GetUserResource();
|
|
96
96
|
const retVal = await this.#accessLayer.DeleteEntity({
|
|
97
97
|
filters: {
|
|
98
|
-
dbactionuser:
|
|
98
|
+
dbactionuser: commonTypes_js_1.SYSTEM_USER_ID,
|
|
99
99
|
resname: userResource.resname,
|
|
100
100
|
entname: user.name
|
|
101
101
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dalUserManager.js","sourceRoot":"","sources":["../src/dalUserManager.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"dalUserManager.js","sourceRoot":"","sources":["../src/dalUserManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,12 +9,12 @@ const vitest_1 = require("vitest");
|
|
|
9
9
|
const chalk_1 = __importDefault(require("chalk"));
|
|
10
10
|
const stsconfig_1 = require("@nsshunt/stsconfig");
|
|
11
11
|
const stsutils_1 = require("@nsshunt/stsutils");
|
|
12
|
-
const
|
|
12
|
+
const databaseutils_js_1 = require("./databaseutils.js");
|
|
13
13
|
const testcontainers_1 = require("testcontainers");
|
|
14
14
|
const winston_1 = __importDefault(require("winston"));
|
|
15
|
-
const
|
|
16
|
-
const
|
|
17
|
-
const
|
|
15
|
+
const dbAccessLayerManager_js_1 = require("./dbAccessLayerManager.js");
|
|
16
|
+
const commonTypes_js_1 = require("./commonTypes.js");
|
|
17
|
+
const dalUserManager_js_1 = require("./dalUserManager.js");
|
|
18
18
|
var eResouceStatus;
|
|
19
19
|
(function (eResouceStatus) {
|
|
20
20
|
eResouceStatus["delete"] = "DELETED";
|
|
@@ -59,14 +59,14 @@ var eResouceStatus;
|
|
|
59
59
|
workerScriptFolder: './dist', //@@
|
|
60
60
|
useMultiBar: false
|
|
61
61
|
};
|
|
62
|
-
const dbUtils = new
|
|
62
|
+
const dbUtils = new databaseutils_js_1.DatabaseUtils({
|
|
63
63
|
logger
|
|
64
64
|
});
|
|
65
65
|
await dbUtils.CreateDatabase(dbOptions);
|
|
66
66
|
await (0, stsutils_1.Sleep)(1000);
|
|
67
67
|
logger.info(chalk_1.default.green(`Starting accessLayer`));
|
|
68
|
-
accessLayer = new
|
|
69
|
-
accessLayerType:
|
|
68
|
+
accessLayer = new dbAccessLayerManager_js_1.DBAccessLayerManager().CreateAccessLayer({
|
|
69
|
+
accessLayerType: commonTypes_js_1.accessLayerType.postgresql,
|
|
70
70
|
accessLayerOptions: {
|
|
71
71
|
logger: stsutils_1.defaultLogger,
|
|
72
72
|
usedefaultdb: false
|
|
@@ -77,8 +77,8 @@ var eResouceStatus;
|
|
|
77
77
|
}, 120000);
|
|
78
78
|
(0, vitest_1.test)('Testing STSUser', async () => {
|
|
79
79
|
vitest_1.expect.assertions(6);
|
|
80
|
-
const userManager = new
|
|
81
|
-
accessLayerType:
|
|
80
|
+
const userManager = new dalUserManager_js_1.DALUserManager({
|
|
81
|
+
accessLayerType: commonTypes_js_1.accessLayerType.postgresql,
|
|
82
82
|
accessLayerOptions: {
|
|
83
83
|
logger: stsutils_1.defaultLogger,
|
|
84
84
|
usedefaultdb: false
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dalUserManager.test.js","sourceRoot":"","sources":["../src/dalUserManager.test.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,mCAAqE;AAErE,kDAA0B;AAE1B,kDAA4D;AAE5D,gDAAmE;AAEnE,
|
|
1
|
+
{"version":3,"file":"dalUserManager.test.js","sourceRoot":"","sources":["../src/dalUserManager.test.ts"],"names":[],"mappings":"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"}
|
package/dist/databaseutils.js
CHANGED
|
@@ -5,10 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.DatabaseUtils = void 0;
|
|
7
7
|
const chalk_1 = __importDefault(require("chalk"));
|
|
8
|
-
const
|
|
9
|
-
const
|
|
10
|
-
const
|
|
11
|
-
const
|
|
8
|
+
const pgpoolmanager_js_1 = require("./pgpoolmanager.js");
|
|
9
|
+
const pgaccesslayer_old_js_1 = require("./pgaccesslayer-old.js");
|
|
10
|
+
const pgutils_js_1 = require("./pgutils.js");
|
|
11
|
+
const datagenerator_js_1 = require("./datagenerator.js");
|
|
12
12
|
const node_fs_1 = __importDefault(require("node:fs"));
|
|
13
13
|
class DatabaseUtils {
|
|
14
14
|
#options;
|
|
@@ -47,7 +47,7 @@ class DatabaseUtils {
|
|
|
47
47
|
try {
|
|
48
48
|
try {
|
|
49
49
|
this.#LogDebugMessage(chalk_1.default.yellow(`Dropping database.`));
|
|
50
|
-
await
|
|
50
|
+
await pgutils_js_1.PGUtils.dropdatabase(this.#options.logger);
|
|
51
51
|
}
|
|
52
52
|
catch (error) {
|
|
53
53
|
this.#LogErrorMessage(`[${fname}]: Could not drop database: ${error}`);
|
|
@@ -55,9 +55,9 @@ class DatabaseUtils {
|
|
|
55
55
|
}
|
|
56
56
|
// Create a new empty database
|
|
57
57
|
this.#LogDebugMessage(chalk_1.default.yellow(`Creating new empty database.`));
|
|
58
|
-
await
|
|
59
|
-
localAccesslayer = new
|
|
60
|
-
poolManager: new
|
|
58
|
+
await pgutils_js_1.PGUtils.createdatabase(this.#options.logger);
|
|
59
|
+
localAccesslayer = new pgaccesslayer_old_js_1.PGAccessLayer({
|
|
60
|
+
poolManager: new pgpoolmanager_js_1.PGPoolManager({
|
|
61
61
|
usedefaultdb: false,
|
|
62
62
|
logger: this.#options.logger
|
|
63
63
|
}),
|
|
@@ -70,7 +70,7 @@ class DatabaseUtils {
|
|
|
70
70
|
if (typeof iterations !== 'undefined') {
|
|
71
71
|
// Add new faker entries
|
|
72
72
|
this.#LogDebugMessage(chalk_1.default.yellow(`Adding test data.`));
|
|
73
|
-
const dg = new
|
|
73
|
+
const dg = new datagenerator_js_1.DataGenerator({
|
|
74
74
|
accessLayer: localAccesslayer,
|
|
75
75
|
logger: this.#options.logger,
|
|
76
76
|
workerScriptFolder
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"databaseutils.js","sourceRoot":"","sources":["../src/databaseutils.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,
|
|
1
|
+
{"version":3,"file":"databaseutils.js","sourceRoot":"","sources":["../src/databaseutils.ts"],"names":[],"mappings":"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"}
|
package/dist/datagenerator.js
CHANGED
|
@@ -20,7 +20,7 @@ const prompts_1 = __importDefault(require("prompts"));
|
|
|
20
20
|
const stsutils_1 = require("@nsshunt/stsutils");
|
|
21
21
|
const userid = 'dbinitrunner';
|
|
22
22
|
const resrandomuserprefix = 'RESRU-';
|
|
23
|
-
const
|
|
23
|
+
const cliworker_js_1 = require("./cliworker.js");
|
|
24
24
|
class DataGenerator {
|
|
25
25
|
#options;
|
|
26
26
|
#accessLayer;
|
|
@@ -254,7 +254,7 @@ class DataGenerator {
|
|
|
254
254
|
progress,
|
|
255
255
|
logger: this.#options.logger
|
|
256
256
|
};
|
|
257
|
-
const worker = new
|
|
257
|
+
const worker = new cliworker_js_1.CliWorker(options);
|
|
258
258
|
return worker.Run();
|
|
259
259
|
};
|
|
260
260
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datagenerator.js","sourceRoot":"","sources":["../src/datagenerator.ts"],"names":[],"mappings":";;;;;;AAAA,2FAA2F;AAC3F,0EAA0E;AAC1E,kDAA6C;AAE7C,0EAAkC,CAAC,gCAAgC;AAEnE,qCAAqC;AACrC,6CAAyC;AAEzC,kDAAyB;AAEzB,gDAAuB;AACvB,8DAA8D;AAC7D,MAAc,CAAC,OAAO,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;AAElD,kDAAyB;AACzB,gEAAsC;AAEtC,sDAA6B;AAE7B,gDAAiE;AAEjE,MAAM,MAAM,GAAG,cAAc,CAAC;AAC9B,MAAM,mBAAmB,GAAG,QAAQ,CAAA;AAMpC,
|
|
1
|
+
{"version":3,"file":"datagenerator.js","sourceRoot":"","sources":["../src/datagenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DBAccessLayerManager = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
4
|
+
const commonTypes_js_1 = require("./commonTypes.js");
|
|
5
|
+
const pgaccesslayer_js_1 = require("./pgaccesslayer.js");
|
|
6
6
|
class DBAccessLayerManager {
|
|
7
7
|
CreateAccessLayer(options) {
|
|
8
8
|
switch (options.accessLayerType) {
|
|
9
|
-
case
|
|
10
|
-
return new
|
|
9
|
+
case commonTypes_js_1.accessLayerType.postgresql:
|
|
10
|
+
return new pgaccesslayer_js_1.PGAccessLayer(options.accessLayerOptions);
|
|
11
11
|
default:
|
|
12
12
|
throw new Error(`Could not create DBAccessLayer. Unknown type: [${options.accessLayerType}]`);
|
|
13
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dbAccessLayerManager.js","sourceRoot":"","sources":["../src/dbAccessLayerManager.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"dbAccessLayerManager.js","sourceRoot":"","sources":["../src/dbAccessLayerManager.ts"],"names":[],"mappings":";;;AAAA,qDAA8I;AAC9I,yDAAkD;AAElD,MAAa,oBAAoB;IAC7B,iBAAiB,CAAC,OAAqC;QACnD,QAAQ,OAAO,CAAC,eAAe,EAAE,CAAC;YAClC,KAAK,gCAAe,CAAC,UAAU;gBAC3B,OAAO,IAAI,gCAAa,CAAC,OAAO,CAAC,kBAA2C,CAAC,CAAC;YAClF;gBACI,MAAM,IAAI,KAAK,CAAC,kDAAkD,OAAO,CAAC,eAAe,GAAG,CAAC,CAAA;QACjG,CAAC;IACL,CAAC;CACJ;AATD,oDASC"}
|
package/dist/dbaccess.js
CHANGED
|
@@ -14,11 +14,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./commonTypes"), exports);
|
|
18
|
-
__exportStar(require("./pgutils"), exports);
|
|
19
|
-
__exportStar(require("./databaseutils"), exports);
|
|
20
|
-
__exportStar(require("./datagenerator"), exports);
|
|
21
|
-
__exportStar(require("./setupdb"), exports);
|
|
22
|
-
__exportStar(require("./dberrors"), exports);
|
|
23
|
-
__exportStar(require("./dbAccessLayerManager"), exports);
|
|
17
|
+
__exportStar(require("./commonTypes.js"), exports);
|
|
18
|
+
__exportStar(require("./pgutils.js"), exports);
|
|
19
|
+
__exportStar(require("./databaseutils.js"), exports);
|
|
20
|
+
__exportStar(require("./datagenerator.js"), exports);
|
|
21
|
+
__exportStar(require("./setupdb.js"), exports);
|
|
22
|
+
__exportStar(require("./dberrors.js"), exports);
|
|
23
|
+
__exportStar(require("./dbAccessLayerManager.js"), exports);
|
|
24
24
|
//# sourceMappingURL=dbaccess.js.map
|
package/dist/dbaccess.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dbaccess.js","sourceRoot":"","sources":["../src/dbaccess.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"dbaccess.js","sourceRoot":"","sources":["../src/dbaccess.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAgC;AAChC,+CAA4B;AAC5B,qDAAkC;AAClC,qDAAkC;AAClC,+CAA4B;AAC5B,gDAA6B;AAC7B,4DAAyC"}
|
package/dist/dbbuild.test.js
CHANGED
|
@@ -7,11 +7,11 @@ const vitest_1 = require("vitest");
|
|
|
7
7
|
const chalk_1 = __importDefault(require("chalk"));
|
|
8
8
|
const stsconfig_1 = require("@nsshunt/stsconfig");
|
|
9
9
|
const stsutils_1 = require("@nsshunt/stsutils");
|
|
10
|
-
const
|
|
10
|
+
const databaseutils_js_1 = require("./databaseutils.js");
|
|
11
11
|
const testcontainers_1 = require("testcontainers");
|
|
12
12
|
const winston_1 = __importDefault(require("winston"));
|
|
13
|
-
const
|
|
14
|
-
const
|
|
13
|
+
const pgaccesslayer_old_js_1 = require("./pgaccesslayer-old.js");
|
|
14
|
+
const pgpoolmanager_js_1 = require("./pgpoolmanager.js");
|
|
15
15
|
// keep skipped
|
|
16
16
|
vitest_1.describe.skip("Test dbbuild", () => {
|
|
17
17
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -52,14 +52,14 @@ vitest_1.describe.skip("Test dbbuild", () => {
|
|
|
52
52
|
workerScriptFolder: './dist', //@@
|
|
53
53
|
useMultiBar: false
|
|
54
54
|
};
|
|
55
|
-
const dbUtils = new
|
|
55
|
+
const dbUtils = new databaseutils_js_1.DatabaseUtils({
|
|
56
56
|
logger
|
|
57
57
|
});
|
|
58
58
|
await dbUtils.CreateDatabase(dbOptions);
|
|
59
59
|
await (0, stsutils_1.Sleep)(1000);
|
|
60
60
|
logger.info(chalk_1.default.green(`Starting accessLayer`));
|
|
61
|
-
accessLayer = new
|
|
62
|
-
poolManager: new
|
|
61
|
+
accessLayer = new pgaccesslayer_old_js_1.PGAccessLayer({
|
|
62
|
+
poolManager: new pgpoolmanager_js_1.PGPoolManager({
|
|
63
63
|
logger,
|
|
64
64
|
usedefaultdb: false,
|
|
65
65
|
}),
|
package/dist/dbbuild.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dbbuild.test.js","sourceRoot":"","sources":["../src/dbbuild.test.ts"],"names":[],"mappings":";;;;;AAAA,mCAAqE;AAErE,kDAA0B;AAE1B,kDAA4D;AAE5D,gDAAoD;AAEpD,
|
|
1
|
+
{"version":3,"file":"dbbuild.test.js","sourceRoot":"","sources":["../src/dbbuild.test.ts"],"names":[],"mappings":"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"}
|