trm-core 8.4.1 → 8.4.2
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/changelog.txt
CHANGED
|
@@ -43,10 +43,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
43
43
|
};
|
|
44
44
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
45
45
|
exports.PackageDependencies = void 0;
|
|
46
|
-
const trm_commons_1 = require("trm-commons");
|
|
47
46
|
const systemConnector_1 = require("../systemConnector");
|
|
48
47
|
const ObjectDependencies_1 = require("./ObjectDependencies");
|
|
49
48
|
const _ = __importStar(require("lodash"));
|
|
49
|
+
const cliProgress = __importStar(require("cli-progress"));
|
|
50
50
|
class PackageDependencies {
|
|
51
51
|
constructor(devclass) {
|
|
52
52
|
this.devclass = devclass;
|
|
@@ -56,15 +56,33 @@ class PackageDependencies {
|
|
|
56
56
|
}
|
|
57
57
|
setDependencies(packageDependencies, log) {
|
|
58
58
|
return __awaiter(this, void 0, void 0, function* () {
|
|
59
|
-
var i =
|
|
60
|
-
|
|
59
|
+
var i = 0;
|
|
60
|
+
var logProgress;
|
|
61
|
+
if (log) {
|
|
62
|
+
logProgress = new cliProgress.SingleBar({
|
|
63
|
+
clearOnComplete: true,
|
|
64
|
+
hideCursor: true,
|
|
65
|
+
format: 'Analyzing dependencies [{bar}] {percentage}% ({value}/{total})'
|
|
66
|
+
}, cliProgress.Presets.legacy);
|
|
67
|
+
logProgress.start(packageDependencies.length, 0);
|
|
68
|
+
}
|
|
61
69
|
for (const d of packageDependencies) {
|
|
62
|
-
trm_commons_1.Logger.loading(`Analyzing dependencies (${(((i + 1) / packageDependencies.length) * 100).toFixed(1)}%)...`, !log);
|
|
63
|
-
trm_commons_1.Logger.loading(`Analyzing dependencies (${(((i + 1) / packageDependencies.length) * 100).toFixed(1)}%) > ${d.pgmid}${d.object}${d.objName}...`, true);
|
|
64
|
-
i++;
|
|
65
70
|
this.allDependencies.push(yield (new ObjectDependencies_1.ObjectDependencies(d.object, d.objName).setDependencies(d.dependencies || [])));
|
|
71
|
+
i++;
|
|
72
|
+
if (log) {
|
|
73
|
+
logProgress.update(i);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
if (log) {
|
|
77
|
+
logProgress.stop();
|
|
78
|
+
logProgress = new cliProgress.SingleBar({
|
|
79
|
+
clearOnComplete: true,
|
|
80
|
+
hideCursor: true,
|
|
81
|
+
format: 'Building dependency tree [{bar}] {percentage}% ({value}/{total})'
|
|
82
|
+
}, cliProgress.Presets.legacy);
|
|
83
|
+
logProgress.start(this.allDependencies.length, 0);
|
|
84
|
+
i = 0;
|
|
66
85
|
}
|
|
67
|
-
trm_commons_1.Logger.loading(`Building dependency tree...`, !log);
|
|
68
86
|
for (const o of this.allDependencies) {
|
|
69
87
|
for (const trmPackage of o.trmPackages) {
|
|
70
88
|
if (trmPackage.trmPackage.getDevclass() !== this.devclass) {
|
|
@@ -119,6 +137,13 @@ class PackageDependencies {
|
|
|
119
137
|
}
|
|
120
138
|
}
|
|
121
139
|
}
|
|
140
|
+
i++;
|
|
141
|
+
if (log) {
|
|
142
|
+
logProgress.update(i);
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
if (log) {
|
|
146
|
+
logProgress.stop();
|
|
122
147
|
}
|
|
123
148
|
return this;
|
|
124
149
|
});
|
|
@@ -1,4 +1,37 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
2
35
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
36
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
37
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -20,6 +53,7 @@ const node_r3trans_1 = require("node-r3trans");
|
|
|
20
53
|
const dependencies_1 = require("../dependencies");
|
|
21
54
|
const commons_1 = require("../commons");
|
|
22
55
|
const SystemConnector_1 = require("./SystemConnector");
|
|
56
|
+
const cliProgress = __importStar(require("cli-progress"));
|
|
23
57
|
exports.TRM_SERVER_PACKAGE_NAME = 'trm-server';
|
|
24
58
|
exports.TRM_SERVER_INTF = 'ZIF_TRM';
|
|
25
59
|
exports.TRM_REST_PACKAGE_NAME = 'trm-rest';
|
|
@@ -569,7 +603,12 @@ class SystemConnectorBase {
|
|
|
569
603
|
return __awaiter(this, void 0, void 0, function* () {
|
|
570
604
|
var packageDependencies;
|
|
571
605
|
if (log) {
|
|
572
|
-
|
|
606
|
+
const logProgress = new cliProgress.SingleBar({
|
|
607
|
+
clearOnComplete: true,
|
|
608
|
+
hideCursor: true,
|
|
609
|
+
format: 'Finding dependencies [{bar}] {percentage}%'
|
|
610
|
+
}, cliProgress.Presets.legacy);
|
|
611
|
+
logProgress.start(100, 0);
|
|
573
612
|
const newConnection = SystemConnector_1.SystemConnector.getNewConnection();
|
|
574
613
|
yield newConnection.connect(true);
|
|
575
614
|
const logId = yield newConnection.createLogPolling('DEVCLASS_D');
|
|
@@ -580,7 +619,10 @@ class SystemConnectorBase {
|
|
|
580
619
|
try {
|
|
581
620
|
const status = yield newConnection.readLogPolling(logId);
|
|
582
621
|
if (status) {
|
|
583
|
-
|
|
622
|
+
const match = status.match(/\(([\d.]+)%\)/);
|
|
623
|
+
if (match) {
|
|
624
|
+
logProgress.update(parseFloat(match[1]));
|
|
625
|
+
}
|
|
584
626
|
}
|
|
585
627
|
}
|
|
586
628
|
catch (_a) { }
|
|
@@ -604,6 +646,7 @@ class SystemConnectorBase {
|
|
|
604
646
|
yield newConnection.closeConnection();
|
|
605
647
|
}
|
|
606
648
|
catch (_b) { }
|
|
649
|
+
logProgress.stop();
|
|
607
650
|
return (yield new dependencies_1.PackageDependencies(devclass).setDependencies(packageDependencies || [], log));
|
|
608
651
|
}
|
|
609
652
|
else {
|