trm-core 4.0.4 → 4.1.0

package/dist/actions/install/checkSapEntries.js

@@ -41,7 +41,8 @@ exports.checkSapEntries = {
                 missingEntries = missingEntries.concat(sapEntriesOutput[t].filter(o => !o.status));
             });
             if (missingEntries.length > 0) {
-                throw new Error(`Package requires SAP entries that don't exist on your system.`);
+                logger_1.Logger.error(JSON.stringify(missingEntries), true);
+                throw new Error(`Package requires ${missingEntries.length} SAP entries that don't exist on your system (run in verbose for more detail).`);
             }
             else {
                 logger_1.Logger.success(`SAP entries checked.`);

package/dist/actions/install/checkTadirObjectTypes.js

@@ -35,9 +35,18 @@ exports.checkTadirObjectTypes = {
         logger_1.Logger.loading(`Checking package objects types...`);
         const systemObjectList = yield systemConnector_1.SystemConnector.getObjectsList();
         aTadir.forEach(o => {
+            var unknownObjects = [];
             if (!systemObjectList.find(k => k.pgmid === o.pgmid && k.object === o.object)) {
+                unknownObjects.push(`${o.pgmid} ${o.object}`);
                 logger_1.Logger.error(`TADIR transport contains object ${o.pgmid} ${o.object} ${o.objName}, which is not supported by target install system`, true);
-                throw new Error(`Transport contains unknown object type ${o.pgmid} ${o.object}.`);
+            }
+            if (unknownObjects.length > 0) {
+                if (unknownObjects.length === 1) {
+                    throw new Error(`Transport contains unknown object type ${unknownObjects[0]}.`);
+                }
+                else {
+                    throw new Error(`Transport contains ${unknownObjects.length} unknown object types (run in verbose for more detail).`);
+                }
             }
         });
         logger_1.Logger.success(`All objects in package "${packageName}" supported.`);

package/dist/actions/install/setSystemPackages.js

@@ -17,7 +17,7 @@ exports.setSystemPackages = {
     run: (context) => __awaiter(void 0, void 0, void 0, function* () {
         var systemPackages = context.parsedInput.systemPackages;
         if (systemPackages.length === 0) {
-            logger_1.Logger.loading(`Reading system packages`, true);
+            logger_1.Logger.loading(`Reading system data...`);
             systemPackages = yield systemConnector_1.SystemConnector.getInstalledPackages(true);
         }
         context.parsedInput.systemPackages = systemPackages;

package/dist/client/RFCClient.d.ts

@@ -4,6 +4,7 @@ import * as struct from "./struct";
 import { IClient } from "./IClient";
 export declare class RFCClient implements IClient {
     private _rfcClient;
+    private _aliveCheck;
     constructor(arg1: any, traceDir?: string);
     open(): Promise<void>;
     checkConnection(): Promise<boolean>;

package/dist/client/RFCClient.js

@@ -38,6 +38,7 @@ const commons_1 = require("../commons");
 const logger_1 = require("../logger");
 class RFCClient {
     constructor(arg1, traceDir) {
+        this._aliveCheck = false;
         process.env["RFC_TRACE_DIR"] = traceDir || process.cwd();
         logger_1.Logger.log(`RFC_TRACE_DIR: ${process.env["RFC_TRACE_DIR"]}`, true);
         this._rfcClient = new noderfc.Client(arg1);
@@ -51,11 +52,14 @@ class RFCClient {
     }
     checkConnection() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this._rfcClient.alive) {
-                logger_1.Logger.success(`RFC open`, true);
-            }
-            else {
-                logger_1.Logger.warning(`RFC closed`, true);
+            if (!this._aliveCheck) {
+                if (this._rfcClient.alive) {
+                    logger_1.Logger.success(`RFC open`, true);
+                }
+                else {
+                    logger_1.Logger.warning(`RFC closed`, true);
+                }
+                this._aliveCheck = true;
             }
             return this._rfcClient.alive;
         });

package/dist/inquirer/CliInquirer.js

@@ -33,8 +33,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CliInquirer = void 0;
-const cliInquirer = __importStar(require("inquirer"));
 const logger_1 = require("../logger");
+const cliInquirer = __importStar(require("@inquirer/prompts"));
 class CliInquirer {
     constructor() { }
     prompt(arg1) {
@@ -42,7 +42,39 @@ class CliInquirer {
             if (logger_1.Logger.logger instanceof logger_1.CliLogger || logger_1.Logger.logger instanceof logger_1.CliLogFileLogger) {
                 logger_1.Logger.logger.forceStop();
             }
-            return yield cliInquirer.default.prompt(arg1);
+            var aQuestions;
+            var hash = {};
+            if (!Array.isArray(arg1)) {
+                aQuestions = [arg1];
+            }
+            else {
+                aQuestions = arg1;
+            }
+            for (var question of aQuestions) {
+                if (question.type === 'list') {
+                    question.type = 'select';
+                }
+                if (cliInquirer[question.type]) {
+                    var prompt;
+                    if (question.when === undefined) {
+                        prompt = true;
+                    }
+                    else if (typeof (question.when) === 'boolean') {
+                        prompt = question.when;
+                    }
+                    else {
+                        prompt = yield question.when(hash);
+                    }
+                    if (prompt) {
+                        const oResponse = yield cliInquirer[question.type](question);
+                        hash[question.name] = oResponse;
+                    }
+                }
+                else {
+                    throw new Error(`Unknown CLI inquirer type "${question.type}".`);
+                }
+            }
+            return hash;
         });
     }
 }

package/dist/systemConnector/ISystemConnector.d.ts

@@ -17,7 +17,7 @@ export interface ISystemConnector {
     checkConnection: () => Promise<boolean>;
     getTransportStatus: (trkorr: TRKORR) => Promise<string>;
     getPackageWorkbenchTransport: (oPackage: TrmPackage) => Promise<Transport>;
-    getInstalledPackages: (includeSoruces: boolean) => Promise<TrmPackage[]>;
+    getInstalledPackages: (includeSoruces: boolean, refresh?: boolean) => Promise<TrmPackage[]>;
     generateTrmServerPackage: () => Promise<TrmPackage>;
     getDevclass: (devclass: DEVCLASS) => Promise<TDEVC>;
     getTransportTargets: () => Promise<TMSCSYS[]>;

package/dist/systemConnector/ServerSystemConnector.d.ts

@@ -20,6 +20,8 @@ export declare class ServerSystemConnector implements ISystemConnector {
     private _lang;
     private _user;
     private _client;
+    private _installedPackages;
+    private _installedPackagesI;
     constructor(_connection: Connection, _login: Login);
     getConnectionData(): Connection;
     getDest(): string;
@@ -29,7 +31,7 @@ export declare class ServerSystemConnector implements ISystemConnector {
     checkConnection(): Promise<boolean>;
     getTransportStatus(trkorr: TRKORR): Promise<string>;
     getPackageWorkbenchTransport(oPackage: TrmPackage): Promise<Transport>;
-    getInstalledPackages(includeSoruces?: boolean): Promise<TrmPackage[]>;
+    getInstalledPackages(includeSoruces?: boolean, refresh?: boolean): Promise<TrmPackage[]>;
     generateTrmServerPackage(): Promise<TrmPackage>;
     getDevclass(devclass: DEVCLASS): Promise<TDEVC>;
     getTransportTargets(): Promise<TMSCSYS[]>;

package/dist/systemConnector/ServerSystemConnector.js

@@ -113,7 +113,17 @@ class ServerSystemConnector {
         });
     }
     getInstalledPackages() {
-        return __awaiter(this, arguments, void 0, function* (includeSoruces = true) {
+        return __awaiter(this, arguments, void 0, function* (includeSoruces = true, refresh) {
+            if (!refresh) {
+                if (includeSoruces && this._installedPackagesI) {
+                    logger_1.Logger.log(`Cached version of installed packages with sources`, true);
+                    return this._installedPackagesI;
+                }
+                else if (!includeSoruces && this._installedPackages) {
+                    logger_1.Logger.log(`Cached version of installed packages without sources`, true);
+                    return this._installedPackages;
+                }
+            }
             var trmPackages = [];
             var packageTransports = [];
             logger_1.Logger.log(`Ready to read installed packages`, true);
@@ -184,6 +194,12 @@ class ServerSystemConnector {
             catch (e) {
                 logger_1.Logger.warning(`trm-server is not installed`, true);
             }
+            if (includeSoruces) {
+                this._installedPackagesI = trmPackages;
+            }
+            else {
+                this._installedPackages = trmPackages;
+            }
             return trmPackages;
         });
     }

package/dist/systemConnector/SystemConnector.d.ts

@@ -18,7 +18,7 @@ export declare namespace SystemConnector {
     function checkConnection(): Promise<boolean>;
     function getTransportStatus(trkorr: TRKORR): Promise<string>;
     function getPackageWorkbenchTransport(oPackage: TrmPackage): Promise<Transport>;
-    function getInstalledPackages(includeSources: boolean): Promise<TrmPackage[]>;
+    function getInstalledPackages(includeSources: boolean, refresh?: boolean): Promise<TrmPackage[]>;
     function generateTrmServerPackage(): Promise<TrmPackage>;
     function getDevclass(devclass: DEVCLASS): Promise<TDEVC>;
     function getTransportTargets(): Promise<TMSCSYS[]>;

package/dist/systemConnector/SystemConnector.js

@@ -74,10 +74,10 @@ var SystemConnector;
         });
     }
     SystemConnector.getPackageWorkbenchTransport = getPackageWorkbenchTransport;
-    function getInstalledPackages(includeSources) {
+    function getInstalledPackages(includeSources, refresh) {
         return __awaiter(this, void 0, void 0, function* () {
             yield checkSystemConnector();
-            return SystemConnector.systemConnector.getInstalledPackages(includeSources);
+            return SystemConnector.systemConnector.getInstalledPackages(includeSources, refresh);
         });
     }
     SystemConnector.getInstalledPackages = getInstalledPackages;

package/dist/trmPackage/TrmPackage.js

@@ -108,7 +108,6 @@ class TrmPackage {
             const readme = data.readme || '';
             logger_1.Logger.loading(`Publishing "${packageName}" ${packageVersion} to registry "${this.registry.name}"...`, false);
             yield this.registry.publishArtifact(packageName, packageVersion, artifact, readme);
-            logger_1.Logger.success(`"${packageName}" ${packageVersion} published.`, false);
             this.manifest = new manifest_1.Manifest(trmManifest);
             return this;
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trm-core",
-  "version": "4.0.4",
+  "version": "4.1.0",
   "description": "TRM (Transport Request Manager) Core",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,6 +29,7 @@
   "license": "MIT",
   "dependencies": {
     "@esm2cjs/normalize-url": "^8.0.0",
+    "@inquirer/prompts": "^5.1.1",
     "@simonegaffurini/sammarksworkflow": "^1.3.2-fork",
     "adm-zip": "^0.5.10",
     "axios": "^1.4.0",
@@ -38,7 +39,6 @@
     "email-validator": "^2.0.4",
     "express": "^4.18.2",
     "get-stack-trace": "^3.1.1",
-    "inquirer": "^8.0.0",
     "loading-cli": "^1.1.0",
     "lodash": "^4.17.21",
     "node-r3trans": "^1.0.10",